refactor: implement singleton pattern for key managers and improve resource access

This commit is contained in:
2026-03-19 02:00:56 +01:00
parent cfef49fbc7
commit 470b0c3a8c
14 changed files with 72 additions and 83 deletions

View File

@@ -1,5 +1,4 @@
using Godot;
using Mr.BrickAdventures;
using Mr.BrickAdventures.Autoloads;
namespace Mr.BrickAdventures.scripts.UI;
@@ -12,13 +11,11 @@ public partial class AudioSettings : Control
[Export] public Control AudioSettingsControl { get; set; }
[Export] public float MuteThreshold { get; set; } = -20f;
private UIManager _uiManager;
private ConfigFileHandler _configFileHandler;
private UIManager UIManager => UIManager.Instance;
private ConfigFileHandler ConfigFileHandler => ConfigFileHandler.Instance;
public override void _Ready()
{
_uiManager = GetNode<UIManager>(Constants.UIManagerPath);
_configFileHandler = GetNode<ConfigFileHandler>(Constants.ConfigFileHandlerPath);
Initialize();
MasterVolumeSlider.ValueChanged += OnMasterVolumeChanged;
MusicVolumeSlider.ValueChanged += OnMusicVolumeChanged;
@@ -35,10 +32,10 @@ public partial class AudioSettings : Control
public override void _UnhandledInput(InputEvent @event)
{
if (!@event.IsActionReleased("ui_cancel")) return;
if (!_uiManager.IsScreenOnTop(AudioSettingsControl)) return;
if (!UIManager.IsScreenOnTop(AudioSettingsControl)) return;
SaveSettings();
_uiManager.PopScreen();
UIManager.PopScreen();
}
private void OnSfxVolumeChanged(double value)
@@ -84,7 +81,7 @@ public partial class AudioSettings : Control
private void SaveSettings()
{
var settingsConfig = _configFileHandler.SettingsConfig;
var settingsConfig = ConfigFileHandler.SettingsConfig;
settingsConfig.SetValue("audio_settings", "master_volume", MasterVolumeSlider.Value);
settingsConfig.SetValue("audio_settings", "music_volume", MusicVolumeSlider.Value);
settingsConfig.SetValue("audio_settings", "sfx_volume", SfxVolumeSlider.Value);
@@ -94,7 +91,7 @@ public partial class AudioSettings : Control
private void LoadSettings()
{
var settingsConfig = _configFileHandler.SettingsConfig;
var settingsConfig = ConfigFileHandler.SettingsConfig;
if (!settingsConfig.HasSection("audio_settings")) return;
var masterVolume = (float)settingsConfig.GetValue("audio_settings", "master_volume", MasterVolumeSlider.Value);