Rename PerPlayer packets

BeatTogether · Jul 13, 2024 · b8d96fe · b8d96fe
1 parent 57bcd69
commit b8d96fe
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/BeatTogether.DedicatedServer.Kernel/CommandHandlers/SetPerPlayerDiffHandler.cs b/BeatTogether.DedicatedServer.Kernel/CommandHandlers/SetPerPlayerDiffHandler.cs
@@ -25,7 +25,7 @@ public override void Handle(IPlayer player, SetPerPlayerDifficulties command)
             {
                 Text = "Per player difficulties: " + command.Enabled
             }, IgnoranceChannelTypes.Reliable);
-            _packetDisapatcher.SendToNearbyPlayers(new PerPlayer()
+            _packetDisapatcher.SendToNearbyPlayers(new MpPerPlayerPacket()
             {
                 PPDEnabled = _Configuration.AllowPerPlayerDifficulties,
                 PPMEnabled = _Configuration.AllowPerPlayerModifiers,

diff --git a/BeatTogether.DedicatedServer.Kernel/CommandHandlers/SetPerPlayerModHandler.cs b/BeatTogether.DedicatedServer.Kernel/CommandHandlers/SetPerPlayerModHandler.cs
@@ -26,7 +26,7 @@ public override void Handle(IPlayer player, SetPerPlayerModifiers command)
             {
                 Text = "Per player modifiers: " + command.Enabled
             }, IgnoranceChannelTypes.Reliable);
-            _packetDisapatcher.SendToNearbyPlayers(new PerPlayer()
+            _packetDisapatcher.SendToNearbyPlayers(new MpPerPlayerPacket()
             {
                 PPDEnabled = _Configuration.AllowPerPlayerDifficulties,
                 PPMEnabled = _Configuration.AllowPerPlayerModifiers,

diff --git a/...on/MultiplayerCore/GetPerPlayerHandler.cs → ...playerCore/GetMpPerPlayerPacketHandler.cs b/...on/MultiplayerCore/GetPerPlayerHandler.cs → ...playerCore/GetMpPerPlayerPacketHandler.cs
@@ -6,28 +6,28 @@
 
 namespace BeatTogether.DedicatedServer.Kernel.PacketHandlers.MultiplayerSession.MenuRpc
 {
-    class GetPerPlayerHandler : BasePacketHandler<GetPerPlayer>
+    class GetMpPerPlayerPacketHandler : BasePacketHandler<GetMpPerPlayerPacket>
     {
         private readonly InstanceConfiguration _configuration;
         private readonly IPacketDispatcher _PacketDispatcher;
-        private readonly ILogger _logger = Log.ForContext<GetPerPlayerHandler>();
+        private readonly ILogger _logger = Log.ForContext<GetMpPerPlayerPacketHandler>();
 
-        public GetPerPlayerHandler(
+        public GetMpPerPlayerPacketHandler(
             IPacketDispatcher PacketDispatcher,
             InstanceConfiguration configuration)
         {
             _PacketDispatcher = PacketDispatcher;
             _configuration = configuration;
         }
 
-        public override void Handle(IPlayer sender, GetPerPlayer packet)
+        public override void Handle(IPlayer sender, GetMpPerPlayerPacket packet)
         {
 
             _logger.Debug(
-                $"Handling packet of type '{nameof(GetPerPlayer)}' " +
+                $"Handling packet of type '{nameof(GetMpPerPlayerPacket)}' " +
                 $"(SenderId={sender.ConnectionId})."
             );
-            _PacketDispatcher.SendToPlayer(sender, new PerPlayer()
+            _PacketDispatcher.SendToPlayer(sender, new MpPerPlayerPacket()
             {
                 PPDEnabled = _configuration.AllowPerPlayerDifficulties,
                 PPMEnabled = _configuration.AllowPerPlayerModifiers,

diff --git a/...ssion/MultiplayerCore/PerPlayerHandler.cs → ...ltiplayerCore/MpPerPlayerPacketHandler.cs b/...ssion/MultiplayerCore/PerPlayerHandler.cs → ...ltiplayerCore/MpPerPlayerPacketHandler.cs
@@ -6,32 +6,32 @@
 
 namespace BeatTogether.DedicatedServer.Kernel.PacketHandlers.MultiplayerSession.MenuRpc
 {
-    class PerPlayerHandler : BasePacketHandler<PerPlayer>
+    class MpPerPlayerPacketHandler : BasePacketHandler<MpPerPlayerPacket>
     {
         private readonly InstanceConfiguration _configuration;
         private readonly IPacketDispatcher _PacketDispatcher;
-        private readonly ILogger _logger = Log.ForContext<GetPerPlayerHandler>();
+        private readonly ILogger _logger = Log.ForContext<GetMpPerPlayerPacketHandler>();
 
-        public PerPlayerHandler(
+        public MpPerPlayerPacketHandler(
             IPacketDispatcher PacketDispatcher,
             InstanceConfiguration configuration)
         {
             _PacketDispatcher = PacketDispatcher;
             _configuration = configuration;
         }
 
-        public override void Handle(IPlayer sender, PerPlayer packet)
+        public override void Handle(IPlayer sender, MpPerPlayerPacket packet)
         {
 
             _logger.Debug(
-                $"Handling packet of type '{nameof(PerPlayer)}' " +
+                $"Handling packet of type '{nameof(MpPerPlayerPacket)}' " +
                 $"(SenderId={sender.ConnectionId})."
             );
             if(sender.IsServerOwner)
             {
                 _configuration.AllowPerPlayerDifficulties = packet.PPDEnabled;
                 _configuration.AllowPerPlayerModifiers = packet.PPMEnabled;
-                _PacketDispatcher.SendToNearbyPlayers(new PerPlayer()
+                _PacketDispatcher.SendToNearbyPlayers(new MpPerPlayerPacket()
                 {
                     PPDEnabled = _configuration.AllowPerPlayerDifficulties,
                     PPMEnabled = _configuration.AllowPerPlayerModifiers,

diff --git a/...ayerSession/MpCorePackets/GetPerPlayer.cs → ...ion/MpCorePackets/GetMpPerPlayerPacket.cs b/...ayerSession/MpCorePackets/GetPerPlayer.cs → ...ion/MpCorePackets/GetMpPerPlayerPacket.cs
@@ -3,7 +3,7 @@
 
 namespace BeatTogether.DedicatedServer.Messaging.Packets.MultiplayerSession.MpCorePackets
 {
-    public sealed class GetPerPlayer : INetSerializable
+    public sealed class GetMpPerPlayerPacket : INetSerializable
     {
         public void ReadFrom(ref SpanBuffer bufferReader)
         {

diff --git a/...iplayerSession/MpCorePackets/PerPlayer.cs → ...ession/MpCorePackets/MpPerPlayerPacket.cs b/...iplayerSession/MpCorePackets/PerPlayer.cs → ...ession/MpCorePackets/MpPerPlayerPacket.cs
@@ -3,7 +3,7 @@
 
 namespace BeatTogether.DedicatedServer.Messaging.Packets.MultiplayerSession.MpCorePackets
 {
-    public sealed class PerPlayer : INetSerializable
+    public sealed class MpPerPlayerPacket : INetSerializable
     {
         public bool PPDEnabled;
         public bool PPMEnabled;

diff --git a/BeatTogether.DedicatedServer.Messaging/Registries/MultiplayerCorePacketRegistry.cs b/BeatTogether.DedicatedServer.Messaging/Registries/MultiplayerCorePacketRegistry.cs
@@ -21,8 +21,8 @@ public override void Register()
             AddPacket<GetMpPlayerData>();
             AddPacket<MpPlayerData>();
             AddPacket<MpNodePoseSyncStatePacket>();
-            AddPacket<PerPlayer>();
-            AddPacket<GetPerPlayer>();
+            AddPacket<MpPerPlayerPacket>();
+            AddPacket<GetMpPerPlayerPacket>();
         }
 
         public bool TryCreatePacket(string packetId, [MaybeNullWhen(false)] out INetSerializable packet)