Add MainMenu Controller support #2055

Jannify · 2023-06-24T16:22:00Z

Make server list controller friendly
Add delete confirmation for server list
Make server add window in SN based UI
Make server add window controller friendly
Make server join window controller friendly
Make server password window controller friendly
Add loading and (error-)message window

From Clement:

Unable to scroll with the mousewheel through the server listview when it, I need to hover or focus it with a click on the scrollbar to be able to use the mousewheel scroll
No visual hint that the server has been successfully added to the list using Add Server menu
No warning before clicking on delete on a serve rentry, which is a bit frustrating when using it accidentaly
Didn't look if there's a timeout in our code but in the Loading screen might need a Cancel button if it can be a long process
When joining a reachable server, there's no preview of the color we're choosing that we used to have
Unable to use tab to switch between entry in server create menu
Maybe we could add some margin in the server listview between items. The first item is overflowing a bit on the top, you can see if you force the scroll to offset the listview
Add server button looks like a server entry which could be confusing, maybe we could slightly restyle it or move it elsewhere
Unable to connect to server text, ip could be centered

Partial-Completes #1653
Closes #1816

Drakonkinst

Hi! I'm new here, but I've been reading PRs to get an idea of how this mod is developed. Feel free to take my advice with a grain of salt.

Nitrox.Assets.Subnautica/LanguageFiles/en.json

tornac1234 · 2024-01-21T18:13:51Z

Do we want this in for 1.8 ?

tornac1234

Currently when we click on a server (to join it) and click on another menu (e.g. Play, Multiplayer) while connecting to the server (first step which is notably long when trying to connect to a server that is not started) there's a loading panel appearing which ends up opening an "unable to connect" panel when failing. But this will still open even if we opened another menu in the meantime. For example if we open options while connecting to a server, when we get the fail message, the menu will try to switch to the multiplayer panel but fail and will leave an empty screen.
A fix for this would to cut connection when exiting the loading tab while connecting to a server.

Also I had some issues while selecting the color picker for some reason, some times it work pretty well, but some times it didn't.

Nitrox.Assets.Subnautica/LanguageFiles/en.json

NitroxClient/GameLogic/Settings/NitroxSettingsManager.cs

NitroxModel/Core/NitroxServiceLocator.cs

NitroxPatcher/Patches/Persistent/SystemsSpawner_SetupSingleton_Patch.cs

NitroxClient/MonoBehaviours/Gui/MainMenu/ServersList/MainMenuServerListPanel.cs

NitroxClient/MonoBehaviours/Gui/MainMenu/ServerJoin/JoinServerBackend.cs

dartasen · 2024-05-11T18:34:26Z

UI looks better overall

Legend :

🔴 Very frustrating
🟠 frustrating
🟢 Idea

Few suggestions about the UX, leaving that here I don't know how painful is it to do with the code-behind unity API :

🔴Unable to scroll with the mousewheel through the server listview when it, I need to hover or focus it with a click on the scrollbar to be able to use the mousewheel scroll
🟢 No visual hint that the server has been successfully added to the list using Add Server menu =>
- Maybe a Log.InGame would do the trick if a proper UI is hard to implement
- Either add the server at the top of the list or scroll to the entry when it has been added
🔴 No warning before clicking on delete on a serve rentry, which is a bit frustrating when using it accidentaly =>
- A warning popup would do the trick
🟠 Didn't look if there's a timeout in our code but in the Loading screen might need a Cancel button if it can be a long process
🟠When joining a reachable server, there's no preview of the color we're choosing that we used to have =>
- Maybe coloring the player name text can be enough if adding back the color rectangle could break the UI
🟠 Unable to use tab to switch between entry in server create menu

About the UI :

🟢 Maybe we could add some margin in the server listview between items =>
- The first item is overflowing a bit on the top, you can see if you force the scroll to offset the listview
🟢 Add server button looks like a server entry which could be confusing, maybe we could slightly restyle it or move it elsewhere
🟢 Unable to connect to server text, ip could be centered

Also it's now controller friendly

This re-enables controller support

onClick.RemoveAllListeners() doesn't remove all listeners, see https://docs.unity3d.com/ScriptReference/Events.UnityEventBase.RemoveAllListeners.html

…eScope() is called

Jannify · 2024-10-30T23:07:27Z

Didn't look if there's a timeout in our code but in the Loading screen might need a Cancel button if it can be a long process

It's tightly coupled to multiplayerSession.ConnectAsync(serverIp, serverPort). So if this call fails, LiteNetLib gets a response or the timeout elapses it will switch to another screen.

dartasen · 2024-11-09T19:52:01Z

The improvements you made looks great so far !

Noticed few minors things bugs :

Seems like the red delete color is only applied to freshly created server entry, it does not apply to existing one
Sometimes when a button loose focus, it's text will stuck with a black color, reproductible when navigating back&forth multiple time. (Happens to all button on the multiplayer UI, not just that one)

Noticed few bugs with some translations, but that's not up to that PR, i'll do the fix on weblate.

Merge me

dartasen · 2024-11-17T13:33:37Z

Would add those edits to improve the look & feel :
MainMenuJoinServerPanel:64

playerNameInputField.textComponent.fontSizeMin = 20;
playerNameInputField.textComponent.fontSize = 20;
playerNameInputField.textComponent.fontSizeMax = 22;

MainMenuJoinServerPanel:77

colorPicker.onColorChange.AddListener((data) => playerNameInputField.textComponent.color = data.color);

Found a crash (doesn't seem to be the case on master) :

Open Launcher
Start Game (wait for full launch)
Start Server
Server will show a SocketException (LAN Broadcast server trying to bind to a used port)
Game should crash

Stack trace :

0x00007FFF78BDEC34 (UnityPlayer) UnityMain
0x000001D7F9719E0A (Mono JIT Code) (wrapper managed-to-native) UnityEngine.Mesh:Internal_Create (UnityEngine.Mesh)
0x000001D7F9719D5B (Mono JIT Code) UnityEngine.Mesh:.ctor ()
0x000001D7F9719913 (Mono JIT Code) TMPro.TextMeshProUGUI:Awake ()
0x000001D7838C0FD0 (Mono JIT Code) (wrapper runtime-invoke) object:runtime_invoke_void__this__ (object,intptr,intptr,intptr)
0x00007FFF77E8E290 (mono-2.0-bdwgc) mono_get_runtime_build_info
0x00007FFF77E12AC2 (mono-2.0-bdwgc) mono_perfcounters_init
0x00007FFF77E1BB1F (mono-2.0-bdwgc) mono_runtime_invoke
0x00007FFF78DABCFD (UnityPlayer) UnityMain
0x000001D7F9746B66 (Mono JIT Code) (wrapper managed-to-native) UnityEngine.Object:Internal_CloneSingleWithParent (UnityEngine.Object,UnityEngine.Transform,bool)
0x000001D7F974699B (Mono JIT Code) UnityEngine.Object:Instantiate (UnityEngine.Object,UnityEngine.Transform,bool)
0x000001D7F974688B (Mono JIT Code) UnityEngine.Object:Instantiate<T_REF> (T_REF,UnityEngine.Transform,bool)
0x000001D8010082AB (Mono JIT Code) NitroxClient.MonoBehaviours.Gui.MainMenu.ServersList.MainMenuServerListPanel:CreateServerButton (string,string,int,bool)
0x000001D80107D47B (Mono JIT Code) NitroxClient.MonoBehaviours.Gui.MainMenu.ServersList.MainMenuServerListPanel:<FindLANServersAsync>g__AddButton|37_0 (System.Net.IPEndPoint)
0x000001D80107D314 (Mono JIT Code) NitroxClient.Communication.LANBroadcastClient:OnServerFound (System.Net.IPEndPoint)
0x000001D8010611F3 (Mono JIT Code) NitroxClient.Communication.LANBroadcastClient:<SearchInternalAsync>g__ReceivedResponse|9_0 (System.Net.IPEndPoint,LiteNetLib.NetPacketReader,LiteNetLib.UnconnectedMessageType)
0x000001D80106103E (Mono JIT Code) LiteNetLib.EventBasedNetListener:LiteNetLib.INetEventListener.OnNetworkReceiveUnconnected (System.Net.IPEndPoint,LiteNetLib.NetPacketReader,LiteNetLib.UnconnectedMessageType)
0x000001D801060BC6 (Mono JIT Code) LiteNetLib.NetManager:ProcessEvent (LiteNetLib.NetEvent)
0x000001D801030963 (Mono JIT Code) LiteNetLib.NetManager:PollEvents ()
0x000001D801030083 (Mono JIT Code) NitroxClient.Communication.LANBroadcastClient/<>c__DisplayClass9_0/<<SearchInternalAsync>b__2>d:MoveNext ()

dartasen · 2024-11-17T20:03:37Z

Works fine (apart from the crash)

Measurity

Minor things, otherwise LGTM CW

Measurity · 2024-11-17T20:49:58Z

NitroxClient/MonoBehaviours/Gui/MainMenu/MainMenuNotificationPanel.cs

+    {
+        if (!instance)
+        {
+            Log.Error("Tried to use ShowLoading() while MainMenuJoinServerNotificationPanel was not ready");


Should use nameof when referring to code symbols.

Measurity · 2024-11-17T20:52:57Z

NitroxClient/MonoBehaviours/Gui/MainMenu/ServerJoin/JoinServerBackend.cs

+            Log.ErrorSensitive("Unable to contact the remote server at: {ip}:{port}", serverIp, serverPort);
+            string msg = $"{Language.main.Get("Nitrox_UnableToConnect")} {serverIp}:{serverPort}";
+
+            if (serverIp.Equals("127.0.0.1"))


Should check for ipv6 too

public static async Task StartMultiplayerClientAsync(IPAddress ip, int port) { // ... if (ip.IsLocalhost()) // ... }

Measurity · 2024-11-17T21:09:35Z

NitroxClient/MonoBehaviours/Gui/MainMenu/ServersList/MainMenuDeleteServer.cs

+    public bool OnButtonDown(GameInput.Button button)
+    {
+        if (button != GameInput.Button.UICancel)
+            return false;


Use brackets for if statement or move return false after the if on same line.

Measurity · 2024-11-17T21:10:36Z

NitroxClient/MonoBehaviours/Gui/MainMenu/ServersList/MainMenuServerListPanel.cs

+        {
+            if (t is { IsFaulted: true, Exception: { } ex })
+            {
+                Log.Warn($"Failed to execute FindLANServersAsync: {ex.GetFirstNonAggregateMessage()}");


Use nameof when referencing code symbols.

Jannify linked an issue Sep 29, 2023 that may be closed by this pull request

Steam features (like Controller mapping) won't load with direct start #1723

Open

Drakonkinst reviewed Dec 1, 2023

View reviewed changes

Nitrox.Assets.Subnautica/LanguageFiles/en.json Outdated Show resolved Hide resolved

tornac1234 added the Area: input Related to game input device handling and key mapping label Dec 23, 2023

Jannify force-pushed the controllerSupport branch from a0c0f46 to 9038864 Compare March 14, 2024 15:08

Jannify marked this pull request as ready for review March 19, 2024 23:48

tornac1234 requested changes Mar 25, 2024

View reviewed changes

Nitrox.Assets.Subnautica/LanguageFiles/en.json Outdated Show resolved Hide resolved

NitroxClient/GameLogic/Settings/NitroxSettingsManager.cs Outdated Show resolved Hide resolved

NitroxModel/Core/NitroxServiceLocator.cs Show resolved Hide resolved

dartasen reviewed Apr 30, 2024

View reviewed changes

NitroxModel/Core/NitroxServiceLocator.cs Outdated Show resolved Hide resolved

Measurity requested changes May 3, 2024

View reviewed changes

Jannify force-pushed the controllerSupport branch 2 times, most recently from 8306604 to 4a037fe Compare May 10, 2024 19:17

Measurity added this to the 1.8 milestone Aug 9, 2024

dartasen mentioned this pull request Aug 21, 2024

Fix errors/warnings #2167

Merged

Jannify force-pushed the controllerSupport branch from 159ce5a to 499f6e6 Compare September 15, 2024 17:59

Jannify force-pushed the controllerSupport branch 3 times, most recently from c06b6b3 to 7af82d0 Compare October 29, 2024 22:08

Jannify added 12 commits October 30, 2024 10:45

Handle uncatched MainMenu errors from Sn Update

822e4d0

Add controller support for server list

a29f63f

Revamped AddServer window to SN style and UI based

90c4117

Also it's now controller friendly

Renaming few MainMenu files to reflect behavior/SN naming conventions

77fa57e

Start SN through steam instead of direct start

dfaddb0

This re-enables controller support

Fix Selectable drawer NRE

bd9bc17

Add controller support for join server input and refactor whole process

665f916

Add basic Array and List entry in Debugger

a64c5c6

Fixed bugs where not all click events where removed

acf6080

onClick.RemoveAllListeners() doesn't remove all listeners, see https://docs.unity3d.com/ScriptReference/Events.UnityEventBase.RemoveAllListeners.html

Add invalidation to NitroxServiceLocator.Cache when EndCurrentLifetim…

e685091

…eScope() is called

Add new UI and controller support for server password input

1947e80

Refactor JoinServerBackend

52baf1b

Jannify added 5 commits October 30, 2024 21:59

Investigating WIP on controllerSupport

488f0bc

Add drawer for EvenTrigger component

c760f4c

Fix scrolling in server list

7c2448c

Improve string building for name/ip/port on server list button

f90d74e

Add translation string in loading panel

8e57165

Jannify force-pushed the controllerSupport branch from 7af82d0 to f90d74e Compare October 30, 2024 22:00

Jannify added 2 commits October 30, 2024 23:44

Added <Tab<, <Shift+Tab> and <Enter> support in server create view

5cefed3

Implement jumping to new server entry after creating

5627dfe

Jannify added 4 commits November 6, 2024 16:53

Center notification text

ae2f8f1

Add spacing between server list entries

da79400

Add request delete screen for server entries

69cd453

Register missed Image drawers and enhanced UnityEventDrawer

0539643

Jannify added 4 commits November 16, 2024 10:36

Fix delete button not being red

d62f20d

Fix button text staying black

fff0ead

Merge me

Increase text size for creating server entry

c25991d

Add color preview in colorPicker

52d7ec2

Jannify force-pushed the controllerSupport branch from 3175938 to 52d7ec2 Compare November 16, 2024 20:33

Adjust player name input field font size with length

3b8d88b

dartasen approved these changes Nov 17, 2024

View reviewed changes

dartasen requested review from tornac1234 and Measurity November 17, 2024 20:04

Measurity approved these changes Nov 17, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add MainMenu Controller support #2055

Add MainMenu Controller support #2055

Jannify commented Jun 24, 2023 •

edited

Loading

Drakonkinst left a comment

tornac1234 commented Jan 21, 2024

tornac1234 left a comment

dartasen commented May 11, 2024 •

edited

Loading

Jannify commented Oct 30, 2024

dartasen commented Nov 9, 2024

dartasen commented Nov 17, 2024 •

edited

Loading

dartasen commented Nov 17, 2024

Measurity left a comment

Measurity Nov 17, 2024

Measurity Nov 17, 2024

Measurity Nov 17, 2024

Measurity Nov 17, 2024

Add MainMenu Controller support #2055

Are you sure you want to change the base?

Add MainMenu Controller support #2055

Conversation

Jannify commented Jun 24, 2023 • edited Loading

Drakonkinst left a comment

Choose a reason for hiding this comment

tornac1234 commented Jan 21, 2024

tornac1234 left a comment

Choose a reason for hiding this comment

dartasen commented May 11, 2024 • edited Loading

Jannify commented Oct 30, 2024

dartasen commented Nov 9, 2024

dartasen commented Nov 17, 2024 • edited Loading

dartasen commented Nov 17, 2024

Measurity left a comment

Choose a reason for hiding this comment

Measurity Nov 17, 2024

Choose a reason for hiding this comment

Measurity Nov 17, 2024

Choose a reason for hiding this comment

Measurity Nov 17, 2024

Choose a reason for hiding this comment

Measurity Nov 17, 2024

Choose a reason for hiding this comment

Jannify commented Jun 24, 2023 •

edited

Loading

dartasen commented May 11, 2024 •

edited

Loading

dartasen commented Nov 17, 2024 •

edited

Loading