diff --git a/osu.Game/Beatmaps/BeatmapConverter.cs b/osu.Game/Beatmaps/BeatmapConverter.cs
index b291edd19d..f3434c5153 100644
--- a/osu.Game/Beatmaps/BeatmapConverter.cs
+++ b/osu.Game/Beatmaps/BeatmapConverter.cs
@@ -27,8 +27,6 @@ namespace osu.Game.Beatmaps
public IBeatmap Beatmap { get; }
- private CancellationToken cancellationToken;
-
protected BeatmapConverter(IBeatmap beatmap, Ruleset ruleset)
{
Beatmap = beatmap;
@@ -41,8 +39,6 @@ namespace osu.Game.Beatmaps
public IBeatmap Convert(CancellationToken cancellationToken = default)
{
- this.cancellationToken = cancellationToken;
-
// We always operate on a clone of the original beatmap, to not modify it game-wide
return ConvertBeatmap(Beatmap.Clone(), cancellationToken);
}
@@ -55,19 +51,6 @@ namespace osu.Game.Beatmaps
/// The converted Beatmap.
protected virtual Beatmap ConvertBeatmap(IBeatmap original, CancellationToken cancellationToken)
{
-#pragma warning disable 618
- return ConvertBeatmap(original);
-#pragma warning restore 618
- }
-
- ///
- /// Performs the conversion of a Beatmap using this Beatmap Converter.
- ///
- /// The un-converted Beatmap.
- /// The converted Beatmap.
- [Obsolete("Use the cancellation-supporting override")] // Can be removed 20210318
- protected virtual Beatmap ConvertBeatmap(IBeatmap original)
- {
var beatmap = CreateBeatmap();
beatmap.BeatmapInfo = original.BeatmapInfo;
@@ -121,21 +104,6 @@ namespace osu.Game.Beatmaps
/// The un-converted Beatmap.
/// The cancellation token.
/// The converted hit object.
- protected virtual IEnumerable ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken)
- {
-#pragma warning disable 618
- return ConvertHitObject(original, beatmap);
-#pragma warning restore 618
- }
-
- ///
- /// Performs the conversion of a hit object.
- /// This method is generally executed sequentially for all objects in a beatmap.
- ///
- /// The hit object to convert.
- /// The un-converted Beatmap.
- /// The converted hit object.
- [Obsolete("Use the cancellation-supporting override")] // Can be removed 20210318
- protected virtual IEnumerable ConvertHitObject(HitObject original, IBeatmap beatmap) => Enumerable.Empty();
+ protected virtual IEnumerable ConvertHitObject(HitObject original, IBeatmap beatmap, CancellationToken cancellationToken) => Enumerable.Empty();
}
}
diff --git a/osu.Game/Beatmaps/BeatmapStatistic.cs b/osu.Game/Beatmaps/BeatmapStatistic.cs
index 9d87a20d60..7d7ba09fcf 100644
--- a/osu.Game/Beatmaps/BeatmapStatistic.cs
+++ b/osu.Game/Beatmaps/BeatmapStatistic.cs
@@ -3,16 +3,11 @@
using System;
using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osuTK;
namespace osu.Game.Beatmaps
{
public class BeatmapStatistic
{
- [Obsolete("Use CreateIcon instead")] // can be removed 20210203
- public IconUsage Icon = FontAwesome.Regular.QuestionCircle;
-
///
/// A function to create the icon for display purposes. Use default icons available via whenever possible for conformity.
///
@@ -20,12 +15,5 @@ namespace osu.Game.Beatmaps
public string Content;
public string Name;
-
- public BeatmapStatistic()
- {
-#pragma warning disable 618
- CreateIcon = () => new SpriteIcon { Icon = Icon, Scale = new Vector2(0.7f) };
-#pragma warning restore 618
- }
}
}
diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index 85765bf991..0bd9750b0b 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -57,13 +57,6 @@ namespace osu.Game.Overlays.Settings
}
}
- [Obsolete("Use Current instead")] // Can be removed 20210406
- public Bindable Bindable
- {
- get => Current;
- set => Current = value;
- }
-
public virtual Bindable Current
{
get => controlWithCurrent.Current;
diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index b1ca72b1c0..be69db5ca8 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -28,18 +28,6 @@ namespace osu.Game.Rulesets.Judgements
///
protected const double DEFAULT_MAX_HEALTH_INCREASE = 0.05;
- ///
- /// Whether this should affect the current combo.
- ///
- [Obsolete("Has no effect. Use HitResult members instead (e.g. use small-tick or bonus to not affect combo).")] // Can be removed 20210328
- public virtual bool AffectsCombo => true;
-
- ///
- /// Whether this should be counted as base (combo) or bonus score.
- ///
- [Obsolete("Has no effect. Use HitResult members instead (e.g. use small-tick or bonus to not affect combo).")] // Can be removed 20210328
- public virtual bool IsBonus => !AffectsCombo;
-
///
/// The maximum that can be achieved.
///
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index e5eaf5db88..e69c4e2d91 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -736,24 +736,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
if (!Result.HasResult)
throw new InvalidOperationException($"{GetType().ReadableName()} applied a {nameof(JudgementResult)} but did not update {nameof(JudgementResult.Type)}.");
- // Some (especially older) rulesets use scorable judgements instead of the newer ignorehit/ignoremiss judgements.
- // Can be removed 20210328
- if (Result.Judgement.MaxResult == HitResult.IgnoreHit)
- {
- HitResult originalType = Result.Type;
-
- if (Result.Type == HitResult.Miss)
- Result.Type = HitResult.IgnoreMiss;
- else if (Result.Type >= HitResult.Meh && Result.Type <= HitResult.Perfect)
- Result.Type = HitResult.IgnoreHit;
-
- if (Result.Type != originalType)
- {
- Logger.Log($"{GetType().ReadableName()} applied an invalid hit result ({originalType}) when {nameof(HitResult.IgnoreMiss)} or {nameof(HitResult.IgnoreHit)} is expected.\n"
- + $"This has been automatically adjusted to {Result.Type}, and support will be removed from 2021-03-28 onwards.", level: LogLevel.Important);
- }
- }
-
if (!Result.Type.IsValidHitResult(Result.Judgement.MinResult, Result.Judgement.MaxResult))
{
throw new InvalidOperationException(
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 826d411822..db02eafa92 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -139,15 +139,6 @@ namespace osu.Game.Rulesets.Objects
}
protected virtual void CreateNestedHitObjects(CancellationToken cancellationToken)
- {
- // ReSharper disable once MethodSupportsCancellation (https://youtrack.jetbrains.com/issue/RIDER-44520)
-#pragma warning disable 618
- CreateNestedHitObjects();
-#pragma warning restore 618
- }
-
- [Obsolete("Use the cancellation-supporting override")] // Can be removed 20210318
- protected virtual void CreateNestedHitObjects()
{
}
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index b81fa79345..0fb5c2f4b5 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -346,12 +346,6 @@ namespace osu.Game.Rulesets.Scoring
score.HitEvents = hitEvents;
}
-
- ///
- /// Create a for this processor.
- ///
- [Obsolete("Method is now unused.")] // Can be removed 20210328
- public virtual HitWindows CreateHitWindows() => new HitWindows();
}
public enum ScoringMode