Working synchronous Addressables settings loading

Assets/Scripts/Core/GameManager.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 using AppleHills.Core.Settings;
-using System.Collections;
+using System;
 
 /// <summary>
 /// Singleton manager for global game state and settings. Provides accessors for various gameplay parameters.
@@ -37,59 +37,88 @@ public class GameManager : MonoBehaviour
 
     [Header("Settings Status")]
     [SerializeField] private bool _settingsLoaded = false;
+    public bool SettingsLoaded => _settingsLoaded;
+    
+    // Use this for fallback values when settings aren't loaded yet
+    [Header("Fallback Settings")]
+    [SerializeField] private GameSettings fallbackSettings;
 
     void Awake()
     {
         _instance = this;
         
+        // If no fallback settings assigned, try to load them
+        if (fallbackSettings == null)
+        {
+            fallbackSettings = Resources.Load<GameSettings>("DefaultSettings");
+        }
+        
         // Create settings provider if it doesn't exist
         SettingsProvider.Instance.gameObject.name = "Settings Provider";
         
-        // Load all settings
-        StartCoroutine(InitializeSettings());
+        // Load all settings synchronously during Awake
+        InitializeSettings();
         
         // DontDestroyOnLoad(gameObject);
     }
 
-    private IEnumerator InitializeSettings()
+    private void InitializeSettings()
     {
-        // Initialize the settings provider
-        var initComplete = false;
-        SettingsProvider.Instance.PreloadAllSettings(() => initComplete = true);
+        Debug.Log("Starting settings initialization...");
+        
+        // Load settings synchronously
+        var playerSettings = SettingsProvider.Instance.LoadSettingsSynchronous<PlayerFollowerSettings>();
+        var interactionSettings = SettingsProvider.Instance.LoadSettingsSynchronous<InteractionSettings>();
+        var minigameSettings = SettingsProvider.Instance.LoadSettingsSynchronous<MinigameSettings>();
         
-        // Wait for settings to be loaded
-        while (!initComplete)
-        {
-            yield return null;
-        }
-
         // Register settings with service locator
-        ServiceLocator.Register<IPlayerFollowerSettings>(
-            SettingsProvider.Instance.GetSettings<PlayerFollowerSettings>());
+        if (playerSettings != null)
+        {
+            ServiceLocator.Register<IPlayerFollowerSettings>(playerSettings);
+            Debug.Log("PlayerFollowerSettings registered successfully");
+        }
+        else
+        {
+            Debug.LogError("Failed to load PlayerFollowerSettings");
+        }
             
-        ServiceLocator.Register<IInteractionSettings>(
-            SettingsProvider.Instance.GetSettings<InteractionSettings>());
+        if (interactionSettings != null)
+        {
+            ServiceLocator.Register<IInteractionSettings>(interactionSettings);
+            Debug.Log("InteractionSettings registered successfully");
+        }
+        else
+        {
+            Debug.LogError("Failed to load InteractionSettings");
+        }
             
-        ServiceLocator.Register<IMinigameSettings>(
-            SettingsProvider.Instance.GetSettings<MinigameSettings>());
+        if (minigameSettings != null)
+        {
+            ServiceLocator.Register<IMinigameSettings>(minigameSettings);
+            Debug.Log("MinigameSettings registered successfully");
+        }
+        else
+        {
+            Debug.LogError("Failed to load MinigameSettings");
+        }
 
         // Log success
-        Debug.Log("All settings loaded and registered with ServiceLocator");
-        _settingsLoaded = true;
+        _settingsLoaded = playerSettings != null && interactionSettings != null && minigameSettings != null;
+        if (_settingsLoaded)
+        {
+            Debug.Log("All settings loaded and registered with ServiceLocator");
+        }
+        else
+        {
+            Debug.LogWarning("Some settings failed to load - check that all settings assets exist and are marked as Addressables");
+        }
         
         // Migrate settings if needed
-        if (legacyGameSettings != null)
+        if (legacyGameSettings != null && !playerSettings && !interactionSettings && !minigameSettings)
         {
-            MigrateFromLegacySettings();
+            Debug.LogWarning("Legacy settings detected but failed to load new settings. Consider running the migration tool.");
         }
     }
-    
-    private void MigrateFromLegacySettings()
-    {
-        // This method can be used to copy settings from the old GameSettings to the new system
-        // Implement if needed for your production environment
-        Debug.Log("Legacy settings migration available but not implemented.");
-    }
 
     void OnApplicationQuit()
     {