refactor(stubs): reorganize into proper namespaces

rushiiMachine · Apr 3, 2024 · 91b331a · 91b331a
1 parent c52d1e8
commit 91b331a
Show file tree

Hide file tree

Showing 45 changed files with 67 additions and 62 deletions.
diff --git a/Osu.Patcher.Hook/Patches/BeatmapMirror/EnableOsuDirect.cs b/Osu.Patcher.Hook/Patches/BeatmapMirror/EnableOsuDirect.cs
@@ -2,7 +2,7 @@
 using System.Reflection;
 using HarmonyLib;
 using JetBrains.Annotations;
-using Osu.Stubs.Other;
+using Osu.Stubs.Online;
 using Osu.Utils.Extensions;
 using static System.Reflection.Emit.OpCodes;
 

diff --git a/Osu.Patcher.Hook/Patches/LivePerformance/AddPerformanceToUi.cs b/Osu.Patcher.Hook/Patches/LivePerformance/AddPerformanceToUi.cs
@@ -4,10 +4,12 @@
 using System.Reflection;
 using HarmonyLib;
 using JetBrains.Annotations;
-using Osu.Stubs.Framework;
-using Osu.Stubs.GameModes;
+using Osu.Stubs.GameModes.Play;
 using Osu.Stubs.Graphics;
+using Osu.Stubs.Graphics.Skinning;
+using Osu.Stubs.Graphics.Sprites;
 using Osu.Stubs.Wrappers;
+using Osu.Stubs.XNA;
 
 namespace Osu.Patcher.Hook.Patches.LivePerformance;
 

diff --git a/Osu.Patcher.Hook/Patches/LivePerformance/PerformanceCalculator.cs b/Osu.Patcher.Hook/Patches/LivePerformance/PerformanceCalculator.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Diagnostics;
 using Osu.Performance;
-using Osu.Stubs.GameModes;
-using Osu.Stubs.Other;
-using Osu.Stubs.Scoring;
+using Osu.Stubs.GameModes.Play;
+using Osu.Stubs.GameplayElements.Beatmaps;
+using Osu.Stubs.GameplayElements.Scoring;
 
 namespace Osu.Patcher.Hook.Patches.LivePerformance;
 

diff --git a/Osu.Patcher.Hook/Patches/LivePerformance/PerformanceDisplay.cs b/Osu.Patcher.Hook/Patches/LivePerformance/PerformanceDisplay.cs
@@ -1,5 +1,5 @@
 using System;
-using Osu.Stubs.Framework;
+using Osu.Stubs.Graphics.Sprites;
 
 namespace Osu.Patcher.Hook.Patches.LivePerformance;
 

diff --git a/Osu.Patcher.Hook/Patches/LivePerformance/TrackOnScoreHit.cs b/Osu.Patcher.Hook/Patches/LivePerformance/TrackOnScoreHit.cs
@@ -5,8 +5,8 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using Osu.Performance;
-using Osu.Stubs.Rulesets;
-using Osu.Stubs.Scoring;
+using Osu.Stubs.GameModes.Play.Rulesets;
+using Osu.Stubs.GameplayElements.Scoring;
 
 namespace Osu.Patcher.Hook.Patches.LivePerformance;
 

diff --git a/Osu.Patcher.Hook/Patches/LivePerformance/TrackResetScore.cs b/Osu.Patcher.Hook/Patches/LivePerformance/TrackResetScore.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using HarmonyLib;
 using JetBrains.Annotations;
-using Osu.Stubs.Rulesets;
+using Osu.Stubs.GameModes.Play.Rulesets;
 
 namespace Osu.Patcher.Hook.Patches.LivePerformance;
 

diff --git a/Osu.Patcher.Hook/Patches/Misc/AllowPlayModeReload.cs b/Osu.Patcher.Hook/Patches/Misc/AllowPlayModeReload.cs
@@ -3,7 +3,7 @@
 using HarmonyLib;
 using JetBrains.Annotations;
 using Osu.Patcher.Hook.Patches.UI;
-using Osu.Stubs.Other;
+using Osu.Stubs.Root;
 using Osu.Utils.Extensions;
 using static System.Reflection.Emit.OpCodes;
 

diff --git a/Osu.Patcher.Hook/Patches/Misc/FixDoubleSkipping.cs b/Osu.Patcher.Hook/Patches/Misc/FixDoubleSkipping.cs
@@ -3,8 +3,8 @@
 using System.Reflection;
 using HarmonyLib;
 using JetBrains.Annotations;
-using Osu.Stubs.GameModes;
-using Osu.Stubs.Other;
+using Osu.Stubs.GameModes.Play;
+using Osu.Stubs.GameplayElements.Events;
 
 namespace Osu.Patcher.Hook.Patches.Misc;
 

diff --git a/Osu.Patcher.Hook/Patches/Misc/LogSoftErrors.cs b/Osu.Patcher.Hook/Patches/Misc/LogSoftErrors.cs
@@ -2,7 +2,7 @@
 using System.Reflection;
 using HarmonyLib;
 using JetBrains.Annotations;
-using Osu.Stubs.Other;
+using Osu.Stubs.Root;
 
 namespace Osu.Patcher.Hook.Patches.Misc;
 

diff --git a/Osu.Patcher.Hook/Patches/Mods/AudioPreview/ModAudioEffects.cs b/Osu.Patcher.Hook/Patches/Mods/AudioPreview/ModAudioEffects.cs
@@ -1,7 +1,7 @@
 using System;
 using Osu.Stubs.Audio;
-using Osu.Stubs.Scoring;
-using static Osu.Stubs.Other.Mods;
+using Osu.Stubs.GameplayElements.Scoring;
+using static Osu.Stubs.Root.Mods;
 
 namespace Osu.Patcher.Hook.Patches.Mods.AudioPreview;
 

diff --git a/Osu.Patcher.Hook/Patches/Mods/AudioPreview/ModSelectAudioPreview.cs b/Osu.Patcher.Hook/Patches/Mods/AudioPreview/ModSelectAudioPreview.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using HarmonyLib;
 using JetBrains.Annotations;
-using Osu.Stubs.SongSelect;
+using Osu.Stubs.GameModes.Select;
 
 namespace Osu.Patcher.Hook.Patches.Mods.AudioPreview;
 

diff --git a/Osu.Patcher.Hook/Patches/Mods/SuddenDeathAutoRetry.cs b/Osu.Patcher.Hook/Patches/Mods/SuddenDeathAutoRetry.cs
@@ -2,9 +2,9 @@
 using System.Reflection;
 using HarmonyLib;
 using JetBrains.Annotations;
-using Osu.Stubs.Rulesets;
+using Osu.Stubs.GameModes.Play.Rulesets;
 using static System.Reflection.Emit.OpCodes;
-using static Osu.Stubs.Other.Mods;
+using static Osu.Stubs.Root.Mods;
 
 namespace Osu.Patcher.Hook.Patches.Mods;
 

diff --git a/Osu.Patcher.Hook/Patches/UI/AllowOpenOptionsInGameplay.cs b/Osu.Patcher.Hook/Patches/UI/AllowOpenOptionsInGameplay.cs
@@ -2,7 +2,7 @@
 using System.Reflection;
 using HarmonyLib;
 using JetBrains.Annotations;
-using Osu.Stubs.Other;
+using Osu.Stubs.GameModes.Options;
 using Osu.Utils.Extensions;
 using static System.Reflection.Emit.OpCodes;
 

diff --git a/Osu.Patcher.Hook/Patches/UI/CustomSongSelectThumbnailAlpha.cs b/Osu.Patcher.Hook/Patches/UI/CustomSongSelectThumbnailAlpha.cs
@@ -3,7 +3,7 @@
 using System.Reflection;
 using HarmonyLib;
 using JetBrains.Annotations;
-using Osu.Stubs.SongSelect;
+using Osu.Stubs.GameplayElements.Beatmaps;
 using Osu.Utils.Extensions;
 using static System.Reflection.Emit.OpCodes;
 

diff --git a/Osu.Patcher.Hook/Patches/UI/RevertSortWhenNoGroup.cs b/Osu.Patcher.Hook/Patches/UI/RevertSortWhenNoGroup.cs
@@ -3,8 +3,9 @@
 using System.Reflection.Emit;
 using HarmonyLib;
 using JetBrains.Annotations;
+using Osu.Stubs.GameModes.Select;
+using Osu.Stubs.GameplayElements.Beatmaps;
 using Osu.Stubs.Helpers;
-using Osu.Stubs.SongSelect;
 using Osu.Utils.Extensions;
 using static System.Reflection.Emit.OpCodes;
 

diff --git a/Osu.Patcher.Hook/Patches/UI/ShowModsInGameplay.cs b/Osu.Patcher.Hook/Patches/UI/ShowModsInGameplay.cs
@@ -3,7 +3,7 @@
 using System.Reflection;
 using HarmonyLib;
 using JetBrains.Annotations;
-using Osu.Stubs.GameModes;
+using Osu.Stubs.GameModes.Play;
 using static System.Reflection.Emit.OpCodes;
 
 namespace Osu.Patcher.Hook.Patches.UI;

diff --git a/Osu.Stubs/Other/Options.cs → Osu.Stubs/GameModes/Options/Options.cs b/Osu.Stubs/Other/Options.cs → Osu.Stubs/GameModes/Options/Options.cs
@@ -2,7 +2,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Other;
+namespace Osu.Stubs.GameModes.Options;
 
 /// <summary>
 ///     Original: <c>osu.GameModes.Options.Options</c>

diff --git a/Osu.Stubs/GameModes/Player.cs → Osu.Stubs/GameModes/Play/Player.cs b/Osu.Stubs/GameModes/Player.cs → Osu.Stubs/GameModes/Play/Player.cs
@@ -1,11 +1,11 @@
 using System.Linq;
 using System.Reflection;
 using JetBrains.Annotations;
-using Osu.Stubs.Scoring;
+using Osu.Stubs.GameplayElements.Scoring;
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.GameModes;
+namespace Osu.Stubs.GameModes.Play;
 
 [PublicAPI]
 public static class Player

diff --git a/Osu.Stubs/Rulesets/IncreaseScoreType.cs → ...eModes/Play/Rulesets/IncreaseScoreType.cs b/Osu.Stubs/Rulesets/IncreaseScoreType.cs → ...eModes/Play/Rulesets/IncreaseScoreType.cs
@@ -1,8 +1,8 @@
 using JetBrains.Annotations;
-using Osu.Stubs.Scoring;
+using Osu.Stubs.GameplayElements.Scoring.Processors;
 using Osu.Utils.Lazy;
 
-namespace Osu.Stubs.Rulesets;
+namespace Osu.Stubs.GameModes.Play.Rulesets;
 
 [PublicAPI]
 public class IncreaseScoreType

diff --git a/Osu.Stubs/Rulesets/Ruleset.cs → Osu.Stubs/GameModes/Play/Rulesets/Ruleset.cs b/Osu.Stubs/Rulesets/Ruleset.cs → Osu.Stubs/GameModes/Play/Rulesets/Ruleset.cs
@@ -1,12 +1,12 @@
 using System.Linq;
 using System.Reflection;
 using JetBrains.Annotations;
-using Osu.Stubs.Scoring;
+using Osu.Stubs.GameplayElements.Scoring;
 using Osu.Utils.Extensions;
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Rulesets;
+namespace Osu.Stubs.GameModes.Play.Rulesets;
 
 [PublicAPI]
 public static class Ruleset
@@ -128,6 +128,6 @@ public static class Ruleset
     public static readonly LazyField<object?> ScoreDisplay = new(
         "osu.GameModes.Play.Rulesets.Ruleset::ScoreDisplay",
         () => Class.Reference.GetRuntimeFields()
-            .Single(field => field.FieldType == GameModes.ScoreDisplay.Class.Reference)
+            .Single(field => field.FieldType == Play.ScoreDisplay.Class.Reference)
     );
 }
diff --git a/Osu.Stubs/GameModes/ScoreDisplay.cs → Osu.Stubs/GameModes/Play/ScoreDisplay.cs b/Osu.Stubs/GameModes/ScoreDisplay.cs → Osu.Stubs/GameModes/Play/ScoreDisplay.cs
@@ -4,7 +4,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.GameModes;
+namespace Osu.Stubs.GameModes.Play;
 
 [PublicAPI]
 public static class ScoreDisplay
@@ -81,6 +81,6 @@ public static class ScoreDisplay
     public static readonly LazyField<object> SpriteManager = new(
         "osu.GameModes.Play.Components.ScoreDisplay::spriteManager",
         () => Class.Reference.GetDeclaredFields()
-            .Single(field => field.FieldType == Graphics.SpriteManager.Class.Reference)
+            .Single(field => field.FieldType == Graphics.Sprites.SpriteManager.Class.Reference)
     );
 }
diff --git a/Osu.Stubs/SongSelect/ModSelection.cs → Osu.Stubs/GameModes/Select/ModSelection.cs b/Osu.Stubs/SongSelect/ModSelection.cs → Osu.Stubs/GameModes/Select/ModSelection.cs
@@ -2,7 +2,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.SongSelect;
+namespace Osu.Stubs.GameModes.Select;
 
 /// <summary>
 ///     Original: <c>osu.GameModes.Select.ModSelection</c>

diff --git a/Osu.Stubs/SongSelect/SongSelection.cs → Osu.Stubs/GameModes/Select/SongSelection.cs b/Osu.Stubs/SongSelect/SongSelection.cs → Osu.Stubs/GameModes/Select/SongSelection.cs
@@ -6,7 +6,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.SongSelect;
+namespace Osu.Stubs.GameModes.Select;
 
 /// <summary>
 ///     Original: <c>osu.GameModes.Select.SongSelection</c>
@@ -57,7 +57,7 @@ public static class SongSelection
     );
 
     /// <summary>
-    ///     Original: <c>beatmapTreeManager</c> of type <see cref="SongSelect.BeatmapTreeManager" />
+    ///     Original: <c>beatmapTreeManager</c> of type <see cref="GameplayElements.Beatmaps.BeatmapTreeManager" />
     ///     b20240102.2: <c>#=zj0IgvXxTqseooUEFmQ==</c>
     /// </summary>
     [Stub]

diff --git a/Osu.Stubs/Other/Beatmap.cs → ...tubs/GameplayElements/Beatmaps/Beatmap.cs b/Osu.Stubs/Other/Beatmap.cs → ...tubs/GameplayElements/Beatmaps/Beatmap.cs
@@ -3,13 +3,13 @@
 using System.Linq;
 using System.Reflection;
 using JetBrains.Annotations;
-using Osu.Stubs.Scoring;
+using Osu.Stubs.GameplayElements.Scoring;
 using Osu.Utils;
 using Osu.Utils.IL;
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Other;
+namespace Osu.Stubs.GameplayElements.Beatmaps;
 
 [PublicAPI]
 public static class Beatmap

diff --git a/Osu.Stubs/SongSelect/BeatmapTreeItem.cs → ...eplayElements/Beatmaps/BeatmapTreeItem.cs b/Osu.Stubs/SongSelect/BeatmapTreeItem.cs → ...eplayElements/Beatmaps/BeatmapTreeItem.cs
@@ -2,7 +2,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.SongSelect;
+namespace Osu.Stubs.GameplayElements.Beatmaps;
 
 /// <summary>
 ///     Original: <c>osu.GameplayElements.Beatmaps.BeatmapTreeItem</c>

diff --git a/Osu.Stubs/SongSelect/BeatmapTreeManager.cs → ...ayElements/Beatmaps/BeatmapTreeManager.cs b/Osu.Stubs/SongSelect/BeatmapTreeManager.cs → ...ayElements/Beatmaps/BeatmapTreeManager.cs
@@ -1,7 +1,8 @@
 using JetBrains.Annotations;
+using Osu.Stubs.GameModes.Select;
 using Osu.Utils.Lazy;
 
-namespace Osu.Stubs.SongSelect;
+namespace Osu.Stubs.GameplayElements.Beatmaps;
 
 /// <summary>
 ///     Original: <c>osu.GameplayElements.Beatmaps.BeatmapTreeManager</c>

diff --git a/Osu.Stubs/Other/EventManager.cs → ...s/GameplayElements/Events/EventManager.cs b/Osu.Stubs/Other/EventManager.cs → ...s/GameplayElements/Events/EventManager.cs
@@ -5,7 +5,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Other;
+namespace Osu.Stubs.GameplayElements.Events;
 
 /// <summary>
 ///     Original: <c>osu.GameplayElements.Events.EventManager</c>

diff --git a/Osu.Stubs/Scoring/ModManager.cs → ...bs/GameplayElements/Scoring/ModManager.cs b/Osu.Stubs/Scoring/ModManager.cs → ...bs/GameplayElements/Scoring/ModManager.cs
@@ -1,11 +1,11 @@
 using System.Linq;
 using HarmonyLib;
 using JetBrains.Annotations;
-using Osu.Stubs.Other;
+using Osu.Stubs.Root;
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Scoring;
+namespace Osu.Stubs.GameplayElements.Scoring;
 
 [PublicAPI]
 public class ModManager

diff --git a/Osu.Stubs/Scoring/ScoreChange.cs → ...lements/Scoring/Processors/ScoreChange.cs b/Osu.Stubs/Scoring/ScoreChange.cs → ...lements/Scoring/Processors/ScoreChange.cs
@@ -1,9 +1,9 @@
 using System.Linq;
 using JetBrains.Annotations;
-using Osu.Stubs.Rulesets;
+using Osu.Stubs.GameModes.Play.Rulesets;
 using Osu.Utils.Lazy;
 
-namespace Osu.Stubs.Scoring;
+namespace Osu.Stubs.GameplayElements.Scoring.Processors;
 
 [PublicAPI]
 public static class ScoreChange

diff --git a/Osu.Stubs/Scoring/ScoreProcessor.cs → ...ents/Scoring/Processors/ScoreProcessor.cs b/Osu.Stubs/Scoring/ScoreProcessor.cs → ...ents/Scoring/Processors/ScoreProcessor.cs
@@ -4,7 +4,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Scoring;
+namespace Osu.Stubs.GameplayElements.Scoring.Processors;
 
 /// <summary>
 ///     Original: <c>osu.GameplayElements.Scoring.Processors.ScoreProcessor</c>

diff --git a/Osu.Stubs/Scoring/Score.cs → Osu.Stubs/GameplayElements/Scoring/Score.cs b/Osu.Stubs/Scoring/Score.cs → Osu.Stubs/GameplayElements/Scoring/Score.cs
@@ -10,7 +10,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Scoring;
+namespace Osu.Stubs.GameplayElements.Scoring;
 
 [PublicAPI]
 public static class Score
@@ -70,7 +70,7 @@ public static class Score
         "osu.GameplayElements.Scoring.Score::Beatmap",
         () => Class.Reference
             .GetRuntimeFields()
-            .Single(inst => inst.FieldType == Other.Beatmap.Class.Reference)
+            .Single(inst => inst.FieldType == Beatmaps.Beatmap.Class.Reference)
     );
 
     /// <summary>

diff --git a/Osu.Stubs/Graphics/NotificationManager.cs → ...hics/Notifications/NotificationManager.cs b/Osu.Stubs/Graphics/NotificationManager.cs → ...hics/Notifications/NotificationManager.cs
@@ -2,7 +2,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Graphics;
+namespace Osu.Stubs.Graphics.Notifications;
 
 /// <summary>
 ///     Original: <c>osu.Graphics.Notifications.NotificationManager</c>

diff --git a/Osu.Stubs/Graphics/SkinManager.cs → Osu.Stubs/Graphics/Skinning/SkinManager.cs b/Osu.Stubs/Graphics/SkinManager.cs → Osu.Stubs/Graphics/Skinning/SkinManager.cs
@@ -4,7 +4,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Graphics;
+namespace Osu.Stubs.Graphics.Skinning;
 
 [PublicAPI]
 public static class SkinManager

diff --git a/Osu.Stubs/Graphics/SkinOsu.cs → Osu.Stubs/Graphics/Skinning/SkinOsu.cs b/Osu.Stubs/Graphics/SkinOsu.cs → Osu.Stubs/Graphics/Skinning/SkinOsu.cs
@@ -2,7 +2,7 @@
 using JetBrains.Annotations;
 using Osu.Utils.Lazy;
 
-namespace Osu.Stubs.Graphics;
+namespace Osu.Stubs.Graphics.Skinning;
 
 /// <summary>
 ///     Most names are present because this class is <c>[Serializable]</c>.

diff --git a/Osu.Stubs/Graphics/SpriteManager.cs → Osu.Stubs/Graphics/Sprites/SpriteManager.cs b/Osu.Stubs/Graphics/SpriteManager.cs → Osu.Stubs/Graphics/Sprites/SpriteManager.cs
@@ -2,7 +2,7 @@
 using Osu.Utils.Lazy;
 using static System.Reflection.Emit.OpCodes;
 
-namespace Osu.Stubs.Graphics;
+namespace Osu.Stubs.Graphics.Sprites;
 
 [PublicAPI]
 public static class SpriteManager