Add MainMenu Controller support

Nitrox.sln.DotSettings

@@ -127,6 +127,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002EMemberReordering_002EMigrations_002ECSharpFileLayoutPatternRemoveIsAttributeUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>

NitroxClient/Debuggers/Drawer/DrawerManager.cs

@@ -10,6 +10,7 @@
 using NitroxModel.Helper;
 using UnityEngine;
 using UnityEngine.Events;
+using UnityEngine.EventSystems;
 using UnityEngine.UI;
 
 namespace NitroxClient.Debuggers.Drawer;
@@ -34,6 +35,7 @@ public DrawerManager(SceneDebugger sceneDebugger)
         RectDrawer rectDrawer = new();
         LayoutGroupDrawer layoutGroupDrawer = new(rectDrawer);
         MaterialDrawer materialDrawer = new();
+        ImageDrawer imageDrawer = new(colorDrawer, materialDrawer, rectDrawer);
         NitroxEntityDrawer nitroxEntityDrawer = new();
 
         AddDrawer<NitroxEntityDrawer, NitroxEntity>(nitroxEntityDrawer);
@@ -47,9 +49,12 @@ public DrawerManager(SceneDebugger sceneDebugger)
         AddDrawer<CanvasScalerDrawer, CanvasScaler>(new(vectorDrawer));
         AddDrawer<ContentSizeFitterDrawer, ContentSizeFitter>();
         AddDrawer<DropdownDrawer, Dropdown>(new(sceneDebugger, selectableDrawer));
+        AddDrawer<EventTriggerDrawer, EventTrigger>(new(sceneDebugger));
         AddDrawer<GraphicRaycasterDrawer, GraphicRaycaster>();
         AddDrawer<GridLayoutGroupDrawer, GridLayoutGroup>(new(vectorDrawer, rectDrawer));
         AddDrawer<LayoutGroupDrawer, HorizontalLayoutGroup>(layoutGroupDrawer);
+        AddDrawer<ImageDrawer, Image>(imageDrawer);
+        AddDrawer<ImageDrawer, RawImage>(imageDrawer);
         AddDrawer<LayoutGroupDrawer, VerticalLayoutGroup>(layoutGroupDrawer);
         AddDrawer<MaskDrawer, Mask>();
         AddDrawer<RectTransformDrawer, RectTransform>(new(vectorDrawer));

NitroxClient/Debuggers/Drawer/NitroxGUILayout.cs

@@ -21,7 +21,7 @@ public static class NitroxGUILayout
 
     public static void Separator()
     {
-        GUILayout.Box(GUIContent.none, separatorStyle, GUILayout.Height(1));
+        GUILayout.Box(GUIContent.none, separatorStyle, GUILayout.Height(5));
     }
 
     public static int IntField(int value, float valueWidth = VALUE_WIDTH) => ConvertibleField(value, valueWidth).ToInt32(CultureInfo.CurrentCulture);
@@ -154,7 +154,7 @@ public static float SliderField(float value, float minValue, float maxValue, flo
     /// <returns>The newly selected enum value.</returns>
     public static Enum EnumPopup(Enum selected, float buttonWidth = VALUE_WIDTH)
     {
-        return EnumPopupInternal(selected, buttonWidth);        
+        return EnumPopupInternal(selected, buttonWidth);
     }
 
     public static T EnumPopup<T>(T selected, float buttonWidth = VALUE_WIDTH) where T : Enum
@@ -183,7 +183,7 @@ bool IsFlagSet<T>(T value, T flag)
                 return (lValue & lFlag) != 0;
             };
 
-            T SetFlags<T>(T value, T flags, bool toggle)
+            object SetFlags(Type type, object value, object flags, bool toggle)
             {
                 long lValue = Convert.ToInt64(value);
                 long lFlag = Convert.ToInt64(flags);
@@ -201,7 +201,7 @@ T SetFlags<T>(T value, T flags, bool toggle)
                     lValue = 0;
                 }
 
-                return (T)Enum.ToObject(typeof(T), lValue);
+                return Enum.ToObject(type, lValue);
             };
 
             Enum[] enumValues = Enum.GetValues(enumType).Cast<Enum>().ToArray();
@@ -215,7 +215,7 @@ T SetFlags<T>(T value, T flags, bool toggle)
 
                     bool isFlagSet = IsFlagSet(selected, enumValue);
 
-                    selected = SetFlags(selected, enumValue, GUILayout.Toggle(isFlagSet, enumName, "Button", GUILayout.Width(buttonWidth)));
+                    selected = (Enum) SetFlags(enumType, selected, enumValue, GUILayout.Toggle(isFlagSet, enumName, "Button", GUILayout.Width(buttonWidth)));
                 }
             }
 

NitroxClient/Debuggers/Drawer/Unity/UnityEventDrawer.cs

@@ -52,7 +52,11 @@ private static void DrawUnityEventBase(UnityEventBase unityEventBase)
             using (new GUILayout.HorizontalScope())
             {
                 NitroxGUILayout.Separator();
-                GUILayout.Label(unityEventBase.GetPersistentMethodName(index), NitroxGUILayout.DrawerLabel, GUILayout.Width(LABEL_WIDTH));
+                Object target = unityEventBase.GetPersistentTarget(index);
+                if(target)
+                    GUILayout.Label($"{target.GetType().Name}.{unityEventBase.GetPersistentMethodName(index)}()", NitroxGUILayout.DrawerLabel, GUILayout.Width(LABEL_WIDTH));
+                else
+                    GUILayout.Label($"{unityEventBase.GetPersistentMethodName(index)}()", NitroxGUILayout.DrawerLabel, GUILayout.Width(LABEL_WIDTH));
             }
         }
     }

NitroxClient/Debuggers/Drawer/UnityUI/EventTriggerDrawer.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Linq;
+using NitroxModel.Helper;
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+namespace NitroxClient.Debuggers.Drawer.UnityUI;
+
+public class EventTriggerDrawer : IDrawer<EventTrigger>
+{
+    private readonly SceneDebugger sceneDebugger;
+
+    public EventTriggerDrawer(SceneDebugger sceneDebugger)
+    {
+        Validate.NotNull(sceneDebugger);
+
+        this.sceneDebugger = sceneDebugger;
+    }
+
+    public void Draw(EventTrigger eventTrigger)
+    {
+        foreach (EventTrigger.Entry entry in eventTrigger.triggers.OrderBy(x => x.eventID))
+        {
+            using (new GUILayout.VerticalScope("box"))
+            {
+                GUILayout.Label($"EventTriggerType.{Enum.GetName(typeof(EventTriggerType), entry.eventID)}");
+
+                for (int i = 0; i < entry.callback.GetPersistentEventCount(); i++)
+                {
+                    using (new GUILayout.HorizontalScope())
+                    {
+                        object target = entry.callback.GetPersistentTarget(i);
+
+                        switch (target)
+                        {
+                            case Component component:
+                                if (GUILayout.Button($"Jump to {component.name}", GUILayout.Width(NitroxGUILayout.DEFAULT_LABEL_WIDTH)))
+                                {
+                                    sceneDebugger.JumpToComponent(component);
+                                }
+                                NitroxGUILayout.Separator();
+                                GUILayout.TextField($"{component.GetType().Name}.{entry.callback.GetPersistentMethodName(i)}()", GUILayout.ExpandWidth(true), GUILayout.MaxWidth(250));
+                                break;
+                            default:
+                                GUILayout.TextField($"[{target.GetType().Name}]: {target}", GUILayout.Width(NitroxGUILayout.DEFAULT_LABEL_WIDTH));
+                                NitroxGUILayout.Separator();
+                                GUILayout.TextField($"{entry.callback.GetPersistentMethodName(i)}()", GUILayout.ExpandWidth(true), GUILayout.MaxWidth(250));
+                                break;
+                        }
+                    }
+                    NitroxGUILayout.Separator();
+                }
+            }
+            NitroxGUILayout.Separator();
+        }
+    }
+}

NitroxClient/Debuggers/Drawer/UnityUI/SelectableDrawer.cs

@@ -148,28 +148,56 @@ private void DrawTransitionSpriteSwap(Selectable selectable)
         {
             GUILayout.Label("Highlighted Sprite", NitroxGUILayout.DrawerLabel, GUILayout.Width(NitroxGUILayout.DEFAULT_LABEL_WIDTH));
             NitroxGUILayout.Separator();
-            ImageDrawer.DrawTexture(selectable.spriteState.highlightedSprite.texture);
+            if (selectable.spriteState.highlightedSprite)
+            {
+                ImageDrawer.DrawTexture(selectable.spriteState.highlightedSprite.texture);
+            }
+            else
+            {
+                GUILayout.Box("Field is null", GUILayout.Width(NitroxGUILayout.VALUE_WIDTH));
+            }
         }
 
         using (new GUILayout.HorizontalScope())
         {
             GUILayout.Label("Pressed Sprite", NitroxGUILayout.DrawerLabel, GUILayout.Width(NitroxGUILayout.DEFAULT_LABEL_WIDTH));
             NitroxGUILayout.Separator();
-            ImageDrawer.DrawTexture(selectable.spriteState.pressedSprite.texture);
+            if (selectable.spriteState.pressedSprite)
+            {
+                ImageDrawer.DrawTexture(selectable.spriteState.pressedSprite.texture);
+            }
+            else
+            {
+                GUILayout.Box("Field is null", GUILayout.Width(NitroxGUILayout.VALUE_WIDTH));
+            }
         }
 
         using (new GUILayout.HorizontalScope())
         {
             GUILayout.Label("Selected Sprite", NitroxGUILayout.DrawerLabel, GUILayout.Width(NitroxGUILayout.DEFAULT_LABEL_WIDTH));
             NitroxGUILayout.Separator();
-            ImageDrawer.DrawTexture(selectable.spriteState.selectedSprite.texture);
+            if (selectable.spriteState.selectedSprite)
+            {
+                ImageDrawer.DrawTexture(selectable.spriteState.selectedSprite.texture);
+            }
+            else
+            {
+                GUILayout.Box("Field is null", GUILayout.Width(NitroxGUILayout.VALUE_WIDTH));
+            }
         }
 
         using (new GUILayout.HorizontalScope())
         {
             GUILayout.Label("Disabled Sprite", NitroxGUILayout.DrawerLabel, GUILayout.Width(NitroxGUILayout.DEFAULT_LABEL_WIDTH));
             NitroxGUILayout.Separator();
-            ImageDrawer.DrawTexture(selectable.spriteState.disabledSprite.texture);
+            if (selectable.spriteState.disabledSprite)
+            {
+                ImageDrawer.DrawTexture(selectable.spriteState.disabledSprite.texture);
+            }
+            else
+            {
+                GUILayout.Box("Field is null", GUILayout.Width(NitroxGUILayout.VALUE_WIDTH));
+            }
         }
     }
 

NitroxClient/Debuggers/SceneDebugger.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
@@ -304,6 +305,16 @@ private void DrawFields(UnityEngine.Object target)
                         JumpToComponent(component);
                     }
                 }
+                else if(fieldValue != null && (field.FieldType.IsArray || typeof(IList).IsAssignableFrom(field.FieldType)))
+                {
+                    IList list = (IList)field.GetValue(target);
+                    GUILayout.Box($"Length: {list.Count}" , GUILayout.Width(NitroxGUILayout.VALUE_WIDTH));
+                }
+                else if(fieldValue != null && (typeof(IDictionary).IsAssignableFrom(field.FieldType)))
+                {
+                    IDictionary dict = (IDictionary)field.GetValue(target);
+                    GUILayout.Box($"Length: {dict.Count}" , GUILayout.Width(NitroxGUILayout.VALUE_WIDTH));
+                }
                 else if (drawerManager.TryDrawEditor(fieldValue, out object editedValue))
                 {
                     field.SetValue(target, editedValue);

NitroxClient/GameLogic/HUD/PdaTabs/uGUI_PlayerPingEntry.cs

@@ -186,10 +186,10 @@ public void UpdateButtonsPosition()
 
     private void ClearButtonListeners()
     {
-        GetToggle(MuteObject).onValueChanged.RemoveAllListeners();
-        GetToggle(KickObject).onValueChanged.RemoveAllListeners();
-        GetToggle(TeleportToObject).onValueChanged.RemoveAllListeners();
-        GetToggle(TeleportToMeObject).onValueChanged.RemoveAllListeners();
+        GetToggle(MuteObject).onValueChanged = new Toggle.ToggleEvent();
+        GetToggle(KickObject).onValueChanged = new Toggle.ToggleEvent();
+        GetToggle(TeleportToObject).onValueChanged = new Toggle.ToggleEvent();
+        GetToggle(TeleportToMeObject).onValueChanged = new Toggle.ToggleEvent();
     }
 
     private IEnumerator AssignSprites()

NitroxClient/GameLogic/Settings/NitroxSettingsManager.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using NitroxClient.GameLogic.Bases;
-using NitroxClient.MonoBehaviours.Gui.MainMenu;
+using NitroxClient.MonoBehaviours.Gui.MainMenu.ServersList;
 using UnityEngine.Events;
 
 namespace NitroxClient.GameLogic.Settings;
@@ -21,9 +21,9 @@ public NitroxSettingsManager()
 
     /// <summary>
     /// Allows to create new settings
-    /// 
+    ///
     /// Available types : TOGGLE, SLIDER, LIST, BUTTON
-    /// 
+    ///
     /// <example>
     /// <para>Examples :</para>
     /// <code>
@@ -38,7 +38,7 @@ private void MakeSettings()
         AddSetting("Nitrox_StreamerSettings", new Setting("Nitrox_HideIp", NitroxPrefs.HideIp, hide =>
         {
             NitroxPrefs.HideIp.Value = hide;
-            MainMenuMultiplayerPanel.Main.RefreshServerEntries();
+            MainMenuServerListPanel.Main.RefreshServerEntries();
         }));
 
         AddSetting("Nitrox_ResyncSettings", new Setting("Nitrox_ResyncBuildings", () =>

NitroxClient/MonoBehaviours/Discord/DiscordClient.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using DiscordGameSDKWrapper;
 using NitroxClient.Communication.Abstract;
-using NitroxClient.MonoBehaviours.Gui.MainMenu;
+using NitroxClient.MonoBehaviours.Gui.MainMenu.ServersList;
 using NitroxModel;
 using NitroxModel.Core;
 using NitroxModel.Packets;
@@ -99,7 +99,7 @@ private void ActivityJoin(string secret)
     {
         Log.Info("[Discord] Joining Server");
 
-        if (SceneManager.GetActiveScene().name != "StartScreen" || !MainMenuMultiplayerPanel.Main)
+        if (SceneManager.GetActiveScene().name != "StartScreen" || !MainMenuServerListPanel.Main)
         {
             Log.InGame(Language.main.Get("Nitrox_DiscordMultiplayerMenu"));
             Log.Warn("[Discord] Can't join a server outside of the main-menu.");
@@ -109,7 +109,13 @@ private void ActivityJoin(string secret)
         string[] splitSecret = secret.Split(':');
         string ip = string.Join(":", splitSecret.Take(splitSecret.Length - 1));
         string port = splitSecret.Last();
-        MainMenuMultiplayerPanel.OpenJoinServerMenuAsync(ip, port).ContinueWithHandleError();
+
+        if(int.TryParse(port, out int portInt))
+        {
+            Log.Error($"[Discord] Port from received secret can't be parsed as int: {port}");
+            return;
+        }
+        MainMenuServerButton.OpenJoinServerMenuAsync(ip, portInt).ContinueWithHandleError(true);
     }
 
     private void ActivityJoinRequest(ref User user)