Merge pull request #13 from Jump-King-Multiplayer/feature/status-panel

Implemented server status panel that shows total players in server and your group
Jump-King-Modding-Platform · Jan 16, 2022 · 93da891 · 93da891
2 parents 708e845 + 6fe0b9c
commit 93da891
Show file tree

Hide file tree

Showing 11 changed files with 161 additions and 3 deletions.
diff --git a/JKMP.Plugin.Multiplayer/Game/Entities/GameEntity.cs b/JKMP.Plugin.Multiplayer/Game/Entities/GameEntity.cs
@@ -28,6 +28,7 @@ public class GameEntity : BaseManagerEntity
 
         private LocalPlayerListener plrListener = null!;
         private Chat chatWidget = null!;
+        private StatusPanel statusPanel = null!;
 
         private float timeSincePositionUpdate;
         private const float PositionUpdateInterval = 30; // Send a position update every 30 seconds
@@ -43,6 +44,7 @@ protected override void OnFirstUpdate()
             chatWidget = UIManager.AddWidget(new Chat());
             localPlayer = EntityManager.instance.Find<PlayerEntity>();
             localPlayer.AddComponents(new PlayerStateTransmitter(P2P), new AudioListenerComponent());
+            statusPanel = UIManager.AddWidget(new StatusPanel());
 
             MatchmakingManager.Instance.Events.NearbyClientsReceived += OnNearbyClientsReceived;
         }
@@ -55,6 +57,7 @@ protected override void OnDestroy()
             plrListener.Dispose();
             P2P.Dispose();
             UIManager.RemoveWidget(chatWidget);
+            UIManager.RemoveWidget(statusPanel);
         }
 
         private void OnNearbyClientsReceived(ICollection<ulong> steamIds)
@@ -78,6 +81,7 @@ protected override void Update(float delta)
             P2P.Update(delta);
             Sound.Update(delta);
             chatWidget.Update(delta);
+            statusPanel.Update(delta);
         }
     }
 }
diff --git a/JKMP.Plugin.Multiplayer/Game/UI/Widgets/StatusPanel.cs b/JKMP.Plugin.Multiplayer/Game/UI/Widgets/StatusPanel.cs
@@ -0,0 +1,70 @@
+using JKMP.Plugin.Multiplayer.Matchmaking;
+using JKMP.Plugin.Multiplayer.Networking;
+using JumpKing.PauseMenu;
+using Matchmaking.Client.EventData;
+using Myra.Graphics2D.UI;
+
+namespace JKMP.Plugin.Multiplayer.Game.UI.Widgets
+{
+    public class StatusPanel : ResourceWidget<StatusPanel>
+    {
+        public string TotalPlayers
+        {
+            get => totalPlayers.Text;
+            set => totalPlayers.Text = value;
+        }
+
+        public string GroupPlayers
+        {
+            get => groupPlayers.Text;
+            set => groupPlayers.Text = value;
+        }
+
+        public bool Connected
+        {
+            get => connected;
+            set
+            {
+                if (value == connected)
+                    return;
+
+                connected = value;
+
+                connectedContainer.Visible = connected;
+                disconnectedContainer.Visible = !connected;
+            }
+        }
+
+        private readonly Label totalPlayers;
+        private readonly Label groupPlayers;
+        private readonly Widget connectedContainer;
+        private readonly Widget disconnectedContainer;
+        private bool connected;
+
+        public StatusPanel() : base("UI/Status/StatusPanel.xmmp")
+        {
+            totalPlayers = EnsureWidgetById<Label>("TotalPlayers");
+            groupPlayers = EnsureWidgetById<Label>("GroupPlayers");
+            connectedContainer = EnsureWidgetById<Widget>("ConnectedContainer");
+            disconnectedContainer = EnsureWidgetById<Widget>("DisconnectedContainer");
+
+            connectedContainer.Visible = false;
+
+            AcceptsKeyboardFocus = false;
+
+            MatchmakingManager.Instance.Events.ServerStatusUpdateReceived += OnServerStatusReceived;
+        }
+
+        private void OnServerStatusReceived(ServerStatus status)
+        {
+            TotalPlayers = status.TotalPlayers.ToString();
+            GroupPlayers = status.GroupPlayers.ToString();
+        }
+
+        public void Update(float delta)
+        {
+            Visible = PauseManager.instance.IsPaused;
+            Connected = MatchmakingManager.Instance.IsConnected;
+        }
+    }
+}
diff --git a/Matchmaking.Client/EventData/ServerStatus.cs b/Matchmaking.Client/EventData/ServerStatus.cs
@@ -0,0 +1,14 @@
+namespace Matchmaking.Client.EventData
+{
+    public class ServerStatus
+    {
+        public uint TotalPlayers { get; set; }
+        public uint GroupPlayers { get; set; }
+
+        public ServerStatus(uint totalPlayers, uint groupPlayers)
+        {
+            TotalPlayers = totalPlayers;
+            GroupPlayers = groupPlayers;
+        }
+    }
+}
diff --git a/Matchmaking.Client/Events.cs b/Matchmaking.Client/Events.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Matchmaking.Client.Chat;
+using Matchmaking.Client.EventData;
 using Matchmaking.Client.Messages;
 
 namespace Matchmaking.Client
@@ -25,5 +26,14 @@ internal void OnChatMessageReceived(ChatMessage message)
         {
             ChatMessageReceived?.Invoke(message);
         }
+
+        public delegate void ServerStatusUpdateReceivedHandler(ServerStatus status);
+
+        public event ServerStatusUpdateReceivedHandler? ServerStatusUpdateReceived;
+
+        internal void OnServerStatusUpdateReceived(ServerStatus status)
+        {
+            ServerStatusUpdateReceived?.Invoke(status);
+        }
     }
 }
diff --git a/Matchmaking.Client/MatchmakingClient.cs b/Matchmaking.Client/MatchmakingClient.cs
@@ -18,7 +18,7 @@ namespace Matchmaking.Client
 {
     public class MatchmakingClient
     {
-        public const uint Version = 1;
+        public const uint Version = 2;
 
         public string? Password { get; private set; }
 

diff --git a/Matchmaking.Client/Messages/Handlers/MatchmakingMessageProcessor.cs b/Matchmaking.Client/Messages/Handlers/MatchmakingMessageProcessor.cs
@@ -8,6 +8,7 @@ public MatchmakingMessageProcessor()
         {
             RegisterHandler(new InformNearbyClientsHandler());
             RegisterHandler(new OutgoingChatMessageHandler());
+            RegisterHandler(new ServerStatusUpdateHandler());
         }
     }
 }
diff --git a/Matchmaking.Client/Messages/Handlers/ServerStatusUpdateHandler.cs b/Matchmaking.Client/Messages/Handlers/ServerStatusUpdateHandler.cs
@@ -0,0 +1,20 @@
+using System.Threading.Tasks;
+using Matchmaking.Client.EventData;
+using Matchmaking.Client.Messages.Processing;
+using Serilog;
+
+namespace Matchmaking.Client.Messages.Handlers
+{
+    internal class ServerStatusUpdateHandler : IMessageHandler<ServerStatusUpdate, Context>
+    {
+        private static readonly ILogger Logger = Log.ForContext<ServerStatusUpdateHandler>();
+
+        public Task HandleMessage(ServerStatusUpdate message, Context context)
+        {
+            Logger.Information("Received server status. Total players: {totalPlayers}, group players: {groupPlayers}", message.TotalPlayers, message.GroupPlayers);
+            context.MatchmakingClient.Events.OnServerStatusUpdateReceived(new ServerStatus(message.TotalPlayers, message.GroupPlayers));
+
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/Matchmaking.Client/Messages/ServerStatusUpdate.cs b/Matchmaking.Client/Messages/ServerStatusUpdate.cs
@@ -0,0 +1,22 @@
+using System;
+using System.IO;
+
+namespace Matchmaking.Client.Messages
+{
+    internal class ServerStatusUpdate : Message
+    {
+        public uint TotalPlayers { get; set; }
+        public uint GroupPlayers { get; set; }
+
+        public override void Serialize(BinaryWriter writer)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override void Deserialize(BinaryReader reader)
+        {
+            TotalPlayers = (uint)reader.ReadVarInt();
+            GroupPlayers = (uint)reader.ReadVarInt();
+        }
+    }
+}
diff --git a/Matchmaking.Client/Networking/MessageType.cs b/Matchmaking.Client/Networking/MessageType.cs
@@ -10,6 +10,7 @@ internal enum MessageType
         /// <summary>Incoming chat message from a client (to server)</summary>
         IncomingChatMessage,
         /// <summary>Outgoing chat message from server (to client)</summary>
-        OutgoingChatMessage
+        OutgoingChatMessage,
+        ServerStatusUpdate,
     }
 }
diff --git a/Matchmaking.Client/Networking/MessagesCodec.cs b/Matchmaking.Client/Networking/MessagesCodec.cs
@@ -18,7 +18,8 @@ internal class MessagesCodec : CodecSink<Message>
             { MessageType.SetMatchmakingPassword, typeof(SetMatchmakingPassword) },
             { MessageType.InformNearbyClients, typeof(InformNearbyClients) },
             { MessageType.IncomingChatMessage, typeof(IncomingChatMessage) },
-            { MessageType.OutgoingChatMessage, typeof(OutgoingChatMessage) }
+            { MessageType.OutgoingChatMessage, typeof(OutgoingChatMessage) },
+            { MessageType.ServerStatusUpdate, typeof(ServerStatusUpdate) }
         };
 
         private static readonly Dictionary<Type, MessageType> MessageTypesReversed = MessageTypes.ToDictionary(kv => kv.Value, kv => kv.Key);

diff --git a/Resources/UI/Status/StatusPanel.xmmp b/Resources/UI/Status/StatusPanel.xmmp
@@ -0,0 +1,15 @@
+<Panel Padding="20" Margin="10, 10, 0, 0" HorizontalAlignment="Left" VerticalAlignment="Top" Background="#00000096">
+    <VerticalStackPanel Id="ConnectedContainer">
+        <HorizontalStackPanel>
+            <Label Text="Players online: " Font="Fonts/OpenSans-Bold.ttf:22" />
+            <Label Id="TotalPlayers" Text="..." Font="Fonts/OpenSans-Bold.ttf:22" />
+        </HorizontalStackPanel>
+        <HorizontalStackPanel>
+            <Label Text="Players in your group: " Font="Fonts/OpenSans-Bold.ttf:22" />
+            <Label Id="GroupPlayers" Text="..." Font="Fonts/OpenSans-Bold.ttf:22" />
+        </HorizontalStackPanel>
+    </VerticalStackPanel>
+    <VerticalStackPanel Id="DisconnectedContainer">
+        <Label Text="Reconnecting..." Font="Fonts/OpenSans-Bold.ttf:22" />
+    </VerticalStackPanel>
+</Panel>