remove instance fields (make them static) from GameState class

Author: Aytackydln

Project-Aurora/Project-Aurora/Nodes/AudioNode.cs

@@ -6,12 +6,18 @@ namespace AuroraRgb.Nodes;
 [GameStateDescription(Description)]
 public class AudioNode : Node
 {
+    public static AudioNode Instance { get; } = new();
+
     private const string Description = """
                                        Data provided by NAudio
                                        """;
 
     public static PlaybackDeviceNode PlaybackDevice { get; } = new();
     public static RecordingDeviceNode RecordingDevice { get; } = new();
+
+    private AudioNode()
+    {
+    }
 }
 
 public class PlaybackDeviceNode : Node

Project-Aurora/Project-Aurora/Nodes/CelestialData.cs

@@ -9,6 +9,8 @@ namespace AuroraRgb.Nodes;
 [GameStateDescription(Description)]
 public class CelestialData : Node
 {
+    public static CelestialData Instance { get; } = new();
+
     private const string Description = """
                                        Provides the solar noon percentage, which indicates how close the sun is to the zenith.
                                        """;
@@ -24,7 +26,7 @@ public class CelestialData : Node
     private Coordinate Coordinate { get; set; } = new(0, 0, El);
     private bool _invalidated = true;
 
-    public CelestialData()
+    private CelestialData()
     {
         Global.SensitiveData.PropertyChanged += (_, propertyChangedEvent) =>
         {

Project-Aurora/Project-Aurora/Nodes/DesktopNode.cs

@@ -6,6 +6,8 @@ namespace AuroraRgb.Nodes;
 
 public class DesktopNode : Node
 {
+    public static DesktopNode Instance { get; } = new();
+
     /// <summary>
     /// Returns whether or not the device dession is in a locked state.
     /// </summary>
@@ -34,7 +36,7 @@ public class DesktopNode : Node
         @"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\CloudStore\\Store\\DefaultAccount\\Current\\default$windows.data.bluelightreduction.settings\\windows.data.bluelightreduction.settings",
         "Data");
 
-    public DesktopNode()
+    private DesktopNode()
     {
         _accentColorWatcher.RegistryChanged += UpdateAccentColor;
         _accentColorWatcher.StartWatching();

Project-Aurora/Project-Aurora/Nodes/DevicesNode.cs

@@ -2,6 +2,12 @@
 
 public class DevicesNode: Node
 {
+    public static readonly DevicesNode Instance = new();
+    
     public Controllers Controllers { get; } = new();
     public RazerDevices RazerDevices { get; } = new();
+
+    private DevicesNode()
+    {
+    }
 }

Project-Aurora/Project-Aurora/Nodes/LocalPCInformation.cs

@@ -11,6 +11,8 @@ namespace AuroraRgb.Nodes;
 [GameStateDescription(Description)]
 public class LocalPcInformation : Node
 {
+    public static LocalPcInformation Instance { get; } = new();
+
     private const string Description = """
                                        Information is mostly provided by LibreHardwareMonitor
                                        
@@ -39,4 +41,8 @@ Information is mostly provided by LibreHardwareMonitor
     public static BatteryNode Battery => _battery ??= new BatteryNode();
 
     public static List<string> NetworkAdapters => HardwareMonitor.NetworkAdapters;
+
+    private LocalPcInformation()
+    {
+    }
 }

Project-Aurora/Project-Aurora/Nodes/MediaNode.cs

@@ -6,6 +6,8 @@ namespace AuroraRgb.Nodes;
 [GameStateDescription(Description)]
 public class MediaNode : Node
 {
+    public static MediaNode Instance { get; } = new();
+
     private const string Description = """
                                        Data is provided by Dubya.WindowsMediaController
                                        """;
@@ -14,4 +16,8 @@ Data is provided by Dubya.WindowsMediaController
     public static bool HasMedia => MediaMonitor.HasMedia;
     public static bool HasNextMedia => MediaMonitor.HasNextMedia;
     public static bool HasPreviousMedia => MediaMonitor.HasPreviousMedia;
+
+    private MediaNode()
+    {
+    }
 }

Project-Aurora/Project-Aurora/Nodes/ProcessesNode.cs

@@ -4,6 +4,7 @@ namespace AuroraRgb.Nodes;
 
 public class ProcessesNode : Node
 {
+    public static readonly ProcessesNode Instance = new();
     /// <summary>
     /// Returns focused window's name.
     /// </summary>
@@ -13,4 +14,7 @@ public class ProcessesNode : Node
     /// Returns focused window's process name.
     /// </summary>
     public static string ActiveProcess => ProcessesModule.ActiveProcessMonitor.Result.ProcessName;
+
+    private ProcessesNode()
+    {}
 }

Project-Aurora/Project-Aurora/Profiles/GameState.cs

@@ -32,43 +32,30 @@ public interface IGameState {
     TEnum GetEnum<TEnum>(VariablePath path) where TEnum : Enum;
 
     FrozenDictionary<string, Func<IGameState, object?>> PropertyMap { get; }
-
-    [Obsolete("Used for reflection access to NewtonsoftGameState properties")]
-    Lazy<ObjectAccessor> LazyObjectAccessor { get; }
 }
 
 public abstract class GameState : IGameState
 {
-    private static LocalPcInformation? _localPcInfo;
-
     [PublicAPI] // game profiles can still access this
-    public static LocalPcInformation LocalPCInfo => _localPcInfo ??= new LocalPcInformation();
+    public static LocalPcInformation LocalPCInfo => LocalPcInformation.Instance;
 
-    private static AudioNode? _audio;
     [PublicAPI]
-    public static AudioNode Audio => _audio ??= new AudioNode();
+    public static AudioNode Audio => AudioNode.Instance;
 
-    private static DevicesNode? _devices;
     [PublicAPI]
-    public static DevicesNode Devices => _devices ??= new DevicesNode();
+    public static DevicesNode Devices => DevicesNode.Instance;
 
-    private DesktopNode? _desktop;
     [PublicAPI]
-    public DesktopNode Desktop => _desktop ??= new DesktopNode();
+    public static DesktopNode Desktop => DesktopNode.Instance;
 
-    private static MediaNode? _media;
     [PublicAPI]
-    public static MediaNode Media => _media ??= new MediaNode();
+    public static MediaNode Media => MediaNode.Instance;
 
-    private CelestialData? _celestialData;
-    public CelestialData CelestialData => _celestialData ??= new CelestialData();
-    
-    private static ProcessesNode? _processes;
     [PublicAPI]
-    public static ProcessesNode Processes => _processes ??= new ProcessesNode();
+    public static CelestialData CelestialData => CelestialData.Instance;
 
-    [GameStateIgnore]
-    public Lazy<ObjectAccessor> LazyObjectAccessor { get; }
+    [PublicAPI]
+    public static ProcessesNode Processes => ProcessesNode.Instance;
 
     [JsonIgnore]
     [GameStateIgnore]
@@ -79,7 +66,6 @@ public abstract class GameState : IGameState
     /// </summary>
     protected GameState()
     {
-        LazyObjectAccessor = new Lazy<ObjectAccessor>(() => ObjectAccessor.Create(this));
     }
 
     #region GameState path resolution
@@ -132,11 +118,16 @@ public partial class NewtonsoftGameState : GameState
     /// </summary>
     [GameStateIgnore]
     public bool Announce { get; } = true;
+    
+    [GameStateIgnore]
+    [Obsolete("Used for reflection access to NewtonsoftGameState properties")]
+    public Lazy<ObjectAccessor> LazyObjectAccessor { get; }
 
     public NewtonsoftGameState()
     {
         Json = "{}";
         _parsedData = new(() => new JObject());
+        LazyObjectAccessor = new Lazy<ObjectAccessor>(() => ObjectAccessor.Create(this));
     }
 
     public NewtonsoftGameState(string json, bool announce) : this(json)
@@ -151,6 +142,7 @@ public NewtonsoftGameState(string json)
 
         Json = json;
         _parsedData = new(() =>JObject.Parse(json));
+        LazyObjectAccessor = new Lazy<ObjectAccessor>(() => ObjectAccessor.Create(this));
     }
 
     /// <summary>

Project-Aurora/Project-Aurora/Utils/FastMemberExtensions.cs

@@ -37,7 +37,7 @@ public static class FastMemberExtensions {
 
                 // Otherwise if this is any other object, use FastMember to access the relevant property/field.
                 else
-                    curObj = curObj is IGameState gs ? gs.LazyObjectAccessor.Value[part] : ObjectAccessor.Create(curObj)[part];
+                    curObj = curObj is NewtonsoftGameState gs ? gs.LazyObjectAccessor.Value[part] : ObjectAccessor.Create(curObj)[part];
             }
 
             return curObj; // If we got here, there is a valid object at this path, return it.