[Entities] Fix missing EntityCallback PersistentCache;

[Core] Minor code cleanup;

Author: LittleCodingFox

Engine/Core/Entities/EntityCallback.cs

@@ -128,6 +128,13 @@ internal void UpdateCache()
 
                         continue;
                     }
+
+                    persistentCache.Add(new()
+                    {
+                        entity = entity,
+                        methodInfo = method,
+                        type = type,
+                    });
                 }
                 catch (Exception e)
                 {

Engine/Core/Entities/EntityID.cs

@@ -1,4 +1,6 @@
-namespace Staple;
+using System;
+
+namespace Staple;
 
 /// <summary>
 /// Represents an entity ID
@@ -43,7 +45,7 @@ public override readonly bool Equals(object obj)
 
     public override readonly int GetHashCode()
     {
-        return ID.GetHashCode() * 17 + generation.GetHashCode();
+        return HashCode.Combine(ID, generation);
     }
 
     public override readonly string ToString()

Engine/Core/Jobs/JobHandle.cs

@@ -47,7 +47,7 @@ public static void CompleteAll(IReadOnlyList<JobHandle> jobs)
         Schedulers.JobHandle.CompleteAll(allHandles.AsSpan());
     }
 
-    public override readonly bool Equals(object? obj)
+    public override readonly bool Equals(object obj)
     {
         return obj is JobHandle handle && Equals(handle);
     }

Engine/Core/Math/Color.cs

@@ -93,7 +93,7 @@ public Color(string value)
 
     public override readonly int GetHashCode()
     {
-        return r.GetHashCode() ^ g.GetHashCode() ^ b.GetHashCode() ^ a.GetHashCode();
+        return HashCode.Combine(r, g, b, a);
     }
 
     public override readonly bool Equals(object obj)

Engine/Core/Math/Color32.cs

@@ -104,7 +104,7 @@ public Color32(uint value)
 
     public override readonly int GetHashCode()
     {
-        return r.GetHashCode() ^ g.GetHashCode() ^ b.GetHashCode() ^ a.GetHashCode();
+        return HashCode.Combine(r, g, b, a);
     }
 
     public override readonly bool Equals(object obj)

Engine/Core/Math/Matrix3x3.cs

@@ -1,4 +1,5 @@
-using System.Diagnostics.CodeAnalysis;
+using System;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Staple;
 
@@ -25,9 +26,9 @@ public static Matrix3x3 Identity
 
     public override readonly int GetHashCode()
     {
-        return M11.GetHashCode() ^ M12.GetHashCode() ^ M13.GetHashCode() ^
-            M21.GetHashCode() ^ M22.GetHashCode() ^ M23.GetHashCode() ^
-            M31.GetHashCode() ^ M32.GetHashCode() ^ M33.GetHashCode();
+        return HashCode.Combine(HashCode.Combine(M11, M12, M13),
+            HashCode.Combine(M21, M22, M23),
+            HashCode.Combine(M31, M32, M33));
     }
 
     public static bool operator==(Matrix3x3 lhs, Matrix3x3 rhs)

Engine/Core/Math/Vector2Int.cs

@@ -56,7 +56,7 @@ public Vector2Int(int X, int Y)
 
     public override readonly int GetHashCode()
     {
-        return X.GetHashCode() ^ Y.GetHashCode();
+        return HashCode.Combine(X, Y);
     }
 
     public override readonly bool Equals(object obj)

Engine/Core/Performance/PerformanceProfiler.cs

@@ -4,7 +4,7 @@
 
 namespace Staple;
 
-public struct PerformanceProfiler(PerformanceProfilerType type) : IDisposable
+public readonly struct PerformanceProfiler(PerformanceProfilerType type) : IDisposable
 {
     private readonly PerformanceProfilerType type = type;
     private readonly DateTime startTime = DateTime.UtcNow;

Engine/Core/Player/Android/StapleActivity.cs

@@ -145,7 +145,7 @@ private static void LogWarning(string message)
         { Keycode.AltRight, KeyCode.RightAlt },
     };
 
-    private SurfaceView? surfaceView;
+    private SurfaceView surfaceView;
     private DateTime lastTime;
     private float fixedTimer = 0.0f;
 
@@ -177,7 +177,7 @@ public void DoFrame(long frameTimeNanos)
 
     class TouchCallback : Java.Lang.Object, View.IOnTouchListener
     {
-        public bool OnTouch(View? v, MotionEvent? e)
+        public bool OnTouch(View v, MotionEvent e)
         {
             for (var i = 0; i < e.PointerCount; i++)
             {
@@ -207,7 +207,7 @@ public bool OnTouch(View? v, MotionEvent? e)
 
     class KeyCallback : Java.Lang.Object, View.IOnKeyListener
     {
-        public bool OnKey(View? v, [GeneratedEnum] Keycode keyCode, KeyEvent? e)
+        public bool OnKey(View v, [GeneratedEnum] Keycode keyCode, KeyEvent e)
         {
             AppEventModifierKeys Modifiers()
             {
@@ -293,9 +293,9 @@ AppEventModifierKeys Modifiers()
         }
     }
 
-    private FrameCallback? frameCallback;
-    private TouchCallback? touchCallback;
-    private KeyCallback? keyCallback;
+    private FrameCallback frameCallback;
+    private TouchCallback touchCallback;
+    private KeyCallback keyCallback;
 
     private void InitIfNeeded()
     {
@@ -602,7 +602,7 @@ public override void OnWindowFocusChanged(bool hasFocus)
         }
     }
 
-    protected override void OnCreate(Bundle? savedInstanceState)
+    protected override void OnCreate(Bundle savedInstanceState)
     {
         base.OnCreate(savedInstanceState);
 
@@ -690,8 +690,11 @@ protected override void OnCreate(Bundle? savedInstanceState)
                 throw new Exception("Failed to deserialize app settings");
             }
 
-            LayerMask.AllLayers = AppSettings.Current.layers;
-            LayerMask.AllSortingLayers = AppSettings.Current.sortingLayers;
+            LayerMask.AllLayers.Clear();
+            LayerMask.AllSortingLayers.Clear();
+
+            LayerMask.AllLayers.AddRange(AppSettings.Current.layers);
+            LayerMask.AllSortingLayers.AddRange(AppSettings.Current.sortingLayers);
         }
         catch (Exception e)
         {

Engine/Core/Player/PlayerSettings.cs

@@ -47,6 +47,8 @@ public static PlayerSettings Load(AppSettings appSettings)
         }
         catch (Exception e)
         {
+            Log.Error($"[PlayerSettings] Failed to load the player settings. Returning default settings. {e}");
+
             return new PlayerSettings()
             {
                 windowMode = appSettings.defaultWindowMode,