h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 03:15:36 +08:00
Code Issues Releases Wiki Activity

Switch protected properties to private where feasible

Browse Source
This commit is contained in:
Dean Herbert 2021-05-28 02:30:31 +09:00
parent d24a712dd4
commit 4e49fbf7fb
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
osu.Game/OsuGameBase.cs
View File

@ -67,22 +67,12 @@ namespace osu.Game
protected ScoreManager ScoreManager { get; private set; } protected ScoreManager ScoreManager { get; private set; }
protected BeatmapDifficultyCache DifficultyCache { get; private set; }
protected UserLookupCache UserCache { get; private set; }
protected SkinManager SkinManager { get; private set; } protected SkinManager SkinManager { get; private set; }
protected RulesetStore RulesetStore { get; private set; } protected RulesetStore RulesetStore { get; private set; }
protected FileStore FileStore { get; private set; }
protected KeyBindingStore KeyBindingStore { get; private set; } protected KeyBindingStore KeyBindingStore { get; private set; }
protected SettingsStore SettingsStore { get; private set; }
protected RulesetConfigCache RulesetConfigCache { get; private set; }
protected MenuCursorContainer MenuCursorContainer { get; private set; } protected MenuCursorContainer MenuCursorContainer { get; private set; }
protected MusicController MusicController { get; private set; } protected MusicController MusicController { get; private set; }
@ -93,13 +83,6 @@ namespace osu.Game
protected Bindable<WorkingBeatmap> Beatmap { get; private set; } // cached via load() method protected Bindable<WorkingBeatmap> Beatmap { get; private set; } // cached via load() method
private SpectatorClient spectatorClient;
private MultiplayerClient multiplayerClient;
private Container content;
protected override Container<Drawable> Content => content;
[Cached] [Cached]
[Cached(typeof(IBindable<RulesetInfo>))] [Cached(typeof(IBindable<RulesetInfo>))]
protected readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>(); protected readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
@ -121,6 +104,24 @@ namespace osu.Game
/// </summary> /// </summary>
public readonly Bindable<Dictionary<ModType, IReadOnlyList<Mod>>> AvailableMods = new Bindable<Dictionary<ModType, IReadOnlyList<Mod>>>(); public readonly Bindable<Dictionary<ModType, IReadOnlyList<Mod>>> AvailableMods = new Bindable<Dictionary<ModType, IReadOnlyList<Mod>>>();
private BeatmapDifficultyCache difficultyCache;
private UserLookupCache userCache;
private FileStore fileStore;
private SettingsStore settingsStore;
private RulesetConfigCache rulesetConfigCache;
private SpectatorClient spectatorClient;
private MultiplayerClient multiplayerClient;
protected override Container<Drawable> Content => content;
private Container content;
private Bindable<bool> fpsDisplayVisible; private Bindable<bool> fpsDisplayVisible;
public virtual Version AssemblyVersion => Assembly.GetEntryAssembly()?.GetName().Version ?? new Version(); public virtual Version AssemblyVersion => Assembly.GetEntryAssembly()?.GetName().Version ?? new Version();
@ -246,10 +247,10 @@ namespace osu.Game
var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures); var defaultBeatmap = new DummyWorkingBeatmap(Audio, Textures);
dependencies.Cache(RulesetStore = new RulesetStore(contextFactory, Storage)); dependencies.Cache(RulesetStore = new RulesetStore(contextFactory, Storage));
dependencies.Cache(FileStore = new FileStore(contextFactory, Storage)); dependencies.Cache(fileStore = new FileStore(contextFactory, Storage));
// ordering is important here to ensure foreign keys rules are not broken in ModelStore.Cleanup() // ordering is important here to ensure foreign keys rules are not broken in ModelStore.Cleanup()
dependencies.Cache(ScoreManager = new ScoreManager(RulesetStore, () => BeatmapManager, Storage, API, contextFactory, Host, () => DifficultyCache, LocalConfig)); dependencies.Cache(ScoreManager = new ScoreManager(RulesetStore, () => BeatmapManager, Storage, API, contextFactory, Host, () => difficultyCache, LocalConfig));
dependencies.Cache(BeatmapManager = new BeatmapManager(Storage, contextFactory, RulesetStore, API, Audio, Host, defaultBeatmap, true)); dependencies.Cache(BeatmapManager = new BeatmapManager(Storage, contextFactory, RulesetStore, API, Audio, Host, defaultBeatmap, true));
// this should likely be moved to ArchiveModelManager when another case appers where it is necessary // this should likely be moved to ArchiveModelManager when another case appers where it is necessary
@ -273,19 +274,19 @@ namespace osu.Game
ScoreManager.Undelete(getBeatmapScores(item), true); ScoreManager.Undelete(getBeatmapScores(item), true);
}); });
dependencies.Cache(DifficultyCache = new BeatmapDifficultyCache()); dependencies.Cache(difficultyCache = new BeatmapDifficultyCache());
AddInternal(DifficultyCache); AddInternal(difficultyCache);
dependencies.Cache(UserCache = new UserLookupCache()); dependencies.Cache(userCache = new UserLookupCache());
AddInternal(UserCache); AddInternal(userCache);
var scorePerformanceManager = new ScorePerformanceCache(); var scorePerformanceManager = new ScorePerformanceCache();
dependencies.Cache(scorePerformanceManager); dependencies.Cache(scorePerformanceManager);
AddInternal(scorePerformanceManager); AddInternal(scorePerformanceManager);
dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore)); dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore));
dependencies.Cache(SettingsStore = new SettingsStore(contextFactory)); dependencies.Cache(settingsStore = new SettingsStore(contextFactory));
dependencies.Cache(RulesetConfigCache = new RulesetConfigCache(SettingsStore)); dependencies.Cache(rulesetConfigCache = new RulesetConfigCache(settingsStore));
var powerStatus = CreateBatteryInfo(); var powerStatus = CreateBatteryInfo();
if (powerStatus != null) if (powerStatus != null)
@ -308,7 +309,7 @@ namespace osu.Game
dependencies.CacheAs<IBindable<WorkingBeatmap>>(Beatmap); dependencies.CacheAs<IBindable<WorkingBeatmap>>(Beatmap);
dependencies.CacheAs(Beatmap); dependencies.CacheAs(Beatmap);
FileStore.Cleanup(); fileStore.Cleanup();
// add api components to hierarchy. // add api components to hierarchy.
if (API is APIAccess apiAccess) if (API is APIAccess apiAccess)
@ -316,7 +317,7 @@ namespace osu.Game
AddInternal(spectatorClient); AddInternal(spectatorClient);
AddInternal(multiplayerClient); AddInternal(multiplayerClient);
AddInternal(RulesetConfigCache); AddInternal(rulesetConfigCache);
GlobalActionContainer globalBindings; GlobalActionContainer globalBindings;