Additional UI rewrites and bug fixes

.editorconfig

@@ -144,6 +144,7 @@ resharper_csharp_wrap_before_invocation_rpar = true
 resharper_csharp_wrap_parameters_style = chop_if_long
 resharper_keep_existing_invocation_parens_arrangement = false
 resharper_keep_existing_property_patterns_arrangement = false
+resharper_max_initializer_elements_on_line = 2
 resharper_max_invocation_arguments_on_line = 5
 resharper_place_expr_property_on_single_line = true
 resharper_place_simple_initializer_on_single_line = false

Framework/Intersect.Framework.Core/GameObjects/Maps/MapList/MapList.cs

@@ -353,7 +353,7 @@ public Guid FindFirstMap()
 
         if (OrderedMaps.Count > 0)
         {
-            lowestMap = OrderedMaps.OrderBy(m => m.TimeCreated).FirstOrDefault().MapId;
+            lowestMap = OrderedMaps.OrderBy(m => m.TimeCreated).FirstOrDefault()?.MapId ?? default;
         }
 
         return lowestMap;

Framework/Intersect.Framework.Core/GameObjects/Maps/MapList/MapListMap.cs

@@ -8,16 +8,14 @@ public partial class MapListMap : MapListItem, IComparable<MapListMap>
 
     public long TimeCreated;
 
-    public MapListMap() : base()
+    public MapListMap()
     {
         Name = "New Map";
         Type = 1;
     }
 
-    public int CompareTo(MapListMap obj)
-    {
-        return Name.CompareTo(obj.Name);
-    }
+    public int CompareTo(MapListMap other) =>
+        string.Compare(Name, other.Name, StringComparison.CurrentCultureIgnoreCase);
 
     public void PostLoad(DatabaseObjectLookup gameMaps, bool isServer = true)
     {

Framework/Intersect.Framework.Core/Models/DbList.cs

@@ -0,0 +1,34 @@
+using System.Diagnostics.CodeAnalysis;
+using Intersect.Collections;
+
+namespace Intersect.Models;
+
+public partial class DbList<T> : List<Guid> where T : IDatabaseObject
+{
+    public List<T> GetAll()
+    {
+        var list = new List<T>();
+        foreach (var l in ToArray())
+        {
+            list.Add((T)DatabaseObjectLookup.LookupMap[typeof(T)].Get(l));
+        }
+
+        return list;
+    }
+
+    public T Get(Guid id)
+    {
+        return (T)DatabaseObjectLookup.LookupMap[typeof(T)].Get(id);
+    }
+
+    public bool TryGet(Guid id, [NotNullWhen(true)] out T? value)
+    {
+        if (DatabaseObjectLookup.LookupMap.TryGetValue(typeof(T), out var lookupMap))
+        {
+            return lookupMap.TryGetValue<T>(id, out value);
+        }
+
+        value = default;
+        return false;
+    }
+}

Framework/Intersect.Framework.Core/Models/IDatabaseObject.cs

@@ -1,5 +1,4 @@
-using Intersect.Collections;
-using Intersect.Enums;
+using Intersect.Enums;
 using Newtonsoft.Json;
 
 namespace Intersect.Models;
@@ -27,25 +26,4 @@ public interface IDatabaseObject : INamedObject
 
     void Delete();
 
-}
-
-public partial class DbList<T> : List<Guid>
-{
-
-    public List<T> GetAll()
-    {
-        var list = new List<T>();
-        foreach (var l in ToArray())
-        {
-            list.Add((T) DatabaseObjectLookup.LookupMap[typeof(T)].Get(l));
-        }
-
-        return list;
-    }
-
-    public T Get(Guid id)
-    {
-        return (T) DatabaseObjectLookup.LookupMap[typeof(T)].Get(id);
-    }
-
-}
+}

Intersect (Core)/Network/Packets/Client/EventInputVariablePacket.cs

@@ -26,7 +26,7 @@ public EventInputVariablePacket(Guid eventId, bool booleanValue, int value, stri
     public bool BooleanValue { get; set; }
 
     [Key(2)]
-    public string StringValue { get; set; }
+    public string? StringValue { get; set; }
 
     [Key(3)]
     public int Value { get; set; }

Intersect.Client.Core/Core/Graphics.cs

@@ -529,7 +529,7 @@ public static void DrawInGame(TimeSpan deltaTime)
     }
 
     //Game Rendering
-    public static void Render(TimeSpan deltaTime, TimeSpan _)
+    public static void Render(TimeSpan deltaTime, TimeSpan totalTime)
     {
         var takingScreenshot = false;
         if (Renderer?.ScreenshotRequests.Count > 0)
@@ -592,7 +592,7 @@ public static void Render(TimeSpan deltaTime, TimeSpan _)
 
         Renderer.Scale = Globals.Database.UIScale;
 
-        Interface.Interface.DrawGui();
+        Interface.Interface.DrawGui(deltaTime, totalTime);
 
         DrawGameTexture(
             Renderer.GetWhiteTexture(), new FloatRect(0, 0, 1, 1), CurrentView,

Intersect.Client.Core/Core/Input.cs

@@ -17,6 +17,8 @@
 
 namespace Intersect.Client.Core;
 
+public delegate bool MouseButtonEventInterceptor(Keys modifier, MouseButton mouseButton);
+
 public static partial class Input
 {
     public delegate void HandleKeyEvent(Keys modifier, Keys key);
@@ -82,9 +84,10 @@ public static void OnKeyPressed(Keys modifier, Keys key)
                 return;
 
             case Keys.Enter:
-                for (int i = Interface.Interface.InputBlockingComponents.Count - 1; i >= 0; i--)
+                var components = Interface.Interface.InputBlockingComponents.ToArray();
+                for (int i = components.Length - 1; i >= 0; i--)
                 {
-                    var inputBlockingComponent = Interface.Interface.InputBlockingComponents[i];
+                    var inputBlockingComponent = components[i];
                     try
                     {
                         if (inputBlockingComponent is InputBox { IsHidden: false } inputBox)
@@ -229,10 +232,14 @@ public static void OnKeyPressed(Keys modifier, Keys key)
                     switch (control)
                     {
                         case Control.Enter:
-                            if (!selectCharacterWindow.IsHidden && selectCharacterWindow.Characters[selectCharacterWindow.mSelectedChar] != null)
+                            if (selectCharacterWindow is { IsHidden: false, CharacterSelectionPreviews: { } previews })
                             {
-                                selectCharacterWindow.ButtonPlay_Clicked(null, null);
-                                consumeKey = true;
+                                var selectedPreviewIndex = selectCharacterWindow._selectedCharacterIndex;
+                                if (previews.Length > selectedPreviewIndex && previews[selectedPreviewIndex] != default)
+                                {
+                                    selectCharacterWindow.ButtonPlay_Clicked(null, null);
+                                    consumeKey = true;
+                                }
                             }
                             break;
                     }
@@ -356,10 +363,31 @@ public static void OnKeyReleased(Keys modifier, Keys key)
         }
     }
 
-    public static void OnMouseDown(Keys modifier, MouseButton btn)
+    public static event MouseButtonEventInterceptor? MouseDownIntercept;
+
+    public static event MouseButtonEventInterceptor? MouseUpIntercept;
+
+    private static bool InvokeMouseButtonInterceptors(
+        MulticastDelegate? multicastDelegate,
+        Keys modifier,
+        MouseButton mouseButton
+    )
+    {
+        var rawInvocationList = multicastDelegate?.GetInvocationList() ?? [];
+        var invocationList = rawInvocationList.OfType<MouseButtonEventInterceptor>().ToArray();
+        return invocationList.Any(interceptor => interceptor(modifier, mouseButton));
+    }
+
+    public static bool TestInterceptMouse(Keys modifier, MouseButton mouseButton, bool down)
+    {
+        return modifier != Keys.Alt &&
+               InvokeMouseButtonInterceptors(down ? MouseDownIntercept : MouseUpIntercept, modifier, mouseButton);
+    }
+
+    public static void OnMouseDown(Keys modifier, MouseButton mouseButton)
     {
         var key = Keys.None;
-        switch (btn)
+        switch (mouseButton)
         {
             case MouseButton.Left:
                 key = Keys.LButton;
@@ -406,7 +434,7 @@ public static void OnMouseDown(Keys modifier, MouseButton btn)
             return;
         }
 
-        if (modifier == Keys.None && btn == MouseButton.Left && Globals.Me.TryTarget())
+        if (modifier == Keys.None && mouseButton == MouseButton.Left && Globals.Me.TryTarget())
         {
             return;
         }
@@ -440,10 +468,10 @@ public static void OnMouseDown(Keys modifier, MouseButton btn)
         }
     }
 
-    public static void OnMouseUp(Keys modifier, MouseButton btn)
+    public static void OnMouseUp(Keys modifier, MouseButton mouseButton)
     {
         var key = Keys.LButton;
-        switch (btn)
+        switch (mouseButton)
         {
             case MouseButton.Right:
                 key = Keys.RButton;
@@ -485,7 +513,7 @@ public static void OnMouseUp(Keys modifier, MouseButton btn)
             return;
         }
 
-        if (btn != MouseButton.Right)
+        if (mouseButton != MouseButton.Right)
         {
             return;
         }

Intersect.Client.Core/Core/Main.cs

@@ -98,6 +98,8 @@ public static void Update(TimeSpan deltaTime)
             Globals.InputManager.Update(deltaTime);
             Audio.Update();
 
+            Time.Update();
+
             Globals.OnGameUpdate(deltaTime);
         }
     }
@@ -267,7 +269,6 @@ private static void ProcessGame()
         }
 
         Graphics.UpdatePlayerLight();
-        Time.Update();
     }
 
     public static void JoinGame()

Intersect.Client.Core/Entities/Entity.cs

@@ -106,7 +106,7 @@ public Guid[] Equipment
     public Guid Id { get; set; }
 
     //Inventory/Spells/Equipment
-    public IItem[] Inventory { get; set; } = new IItem[Options.Instance.Player.MaxInventory];
+    public IItem[] Inventory { get; } = new IItem[Options.Instance.Player.MaxInventory];
 
     IReadOnlyList<IItem> IEntity.Items => [.. Inventory];
 

Intersect.Client.Core/Entities/Events/Dialog.cs

@@ -4,19 +4,11 @@ public partial class Dialog
 {
     public Guid EventId;
 
-    public string Face = string.Empty;
+    public string? Face;
 
-    public string Opt1 = string.Empty;
+    public string[] Options = [];
 
-    public string Opt2 = string.Empty;
+    public string? Prompt;
 
-    public string Opt3 = string.Empty;
-
-    public string Opt4 = string.Empty;
-
-    public string Prompt = string.Empty;
-
-    public int ResponseSent;
-
-    public int Type;
+    public bool ResponseSent;
 }