Added generic BasePieceMetadata change packet processors in preparation for additional instances. Migrated existing Signs implementation to the new system.

Sunrunner37 · Sunrunner37 · commit 7d006e9809cd · 2020-11-22T00:38:17.000-08:00
diff --git a/NitroxClient/ClientAutoFacRegistrar.cs b/NitroxClient/ClientAutoFacRegistrar.cs
@@ -96,7 +96,6 @@ private static void RegisterCoreDependencies(ContainerBuilder containerBuilder)
             containerBuilder.RegisterType<EquipmentSlots>().InstancePerLifetimeScope();
             containerBuilder.RegisterType<ItemContainers>().InstancePerLifetimeScope();
             containerBuilder.RegisterType<StorageSlots>().InstancePerLifetimeScope();
-            containerBuilder.RegisterType<Signs>().InstancePerLifetimeScope();
             containerBuilder.RegisterType<PDAManagerEntry>().InstancePerLifetimeScope();
             containerBuilder.RegisterType<PDAEncyclopediaEntry>().InstancePerLifetimeScope();
             containerBuilder.RegisterType<SimulationOwnership>().InstancePerLifetimeScope();
diff --git a/NitroxClient/Communication/Packets/Processors/BasePieceMetadataChangedProcessor.cs b/NitroxClient/Communication/Packets/Processors/BasePieceMetadataChangedProcessor.cs
@@ -0,0 +1,15 @@
+﻿using NitroxClient.Communication.Packets.Processors.Abstract;
+using NitroxClient.GameLogic.Bases.Metadata;
+using NitroxModel.Packets;
+
+namespace NitroxClient.Communication.Packets.Processors
+{
+    public class BasePieceMetadataChangedProcessor : ClientPacketProcessor<BasePieceMetadataChanged>
+    {
+        public override void Process(BasePieceMetadataChanged packet)
+        {
+            BasePieceMetadataProcessor metadataProcessor = BasePieceMetadataProcessor.FromMetaData(packet.Metadata);
+            metadataProcessor.UpdateMetadata(packet.PieceId, packet.Metadata);
+        }
+    }
+}
diff --git a/NitroxClient/Communication/Packets/Processors/SignChangedProcessor.cs b/NitroxClient/Communication/Packets/Processors/SignChangedProcessor.cs
diff --git a/NitroxClient/GameLogic/Building.cs b/NitroxClient/GameLogic/Building.cs
@@ -4,6 +4,7 @@
 using NitroxClient.MonoBehaviours;
 using NitroxModel.DataStructures;
 using NitroxModel.DataStructures.GameLogic;
+using NitroxModel.DataStructures.GameLogic.Buildings.Metadata;
 using NitroxModel.DataStructures.GameLogic.Buildings.Rotation;
 using NitroxModel.DataStructures.Util;
 using NitroxModel.Helper;
@@ -212,5 +213,11 @@ public void DeconstructionComplete(GameObject gameObject)
             DeconstructionCompleted deconstructionCompleted = new DeconstructionCompleted(id);
             packetSender.Send(deconstructionCompleted);
         }
+
+        public void MetadataChanged(NitroxId pieceId, BasePieceMetadata metadata)
+        {
+            BasePieceMetadataChanged changePacket = new BasePieceMetadataChanged(pieceId, metadata);
+            packetSender.Send(changePacket);
+        }
     }
 }
diff --git a/NitroxClient/GameLogic/Signs.cs b/NitroxClient/GameLogic/Signs.cs
diff --git a/NitroxClient/NitroxClient.csproj b/NitroxClient/NitroxClient.csproj
@@ -202,7 +202,7 @@
     <Compile Include="Communication\Packets\Processors\PlayerDeathProcessor.cs" />
     <Compile Include="Communication\Packets\Processors\PlayerJoinedMultiplayerSessionProcessor.cs" />
     <Compile Include="Communication\Packets\Processors\PlayerStatsProcessor.cs" />
-    <Compile Include="Communication\Packets\Processors\SignChangedProcessor.cs" />
+    <Compile Include="Communication\Packets\Processors\BasePieceMetadataChangedProcessor.cs" />
     <Compile Include="Communication\Packets\Processors\SimulationOwnershipChangeProcessor.cs" />
     <Compile Include="Communication\Packets\Processors\StoryEventHandler.cs" />
     <Compile Include="Communication\Packets\Processors\TimeChangeProcessor.cs" />
@@ -290,7 +290,6 @@
     <Compile Include="GameLogic\RemotePlayer.cs" />
     <Compile Include="GameLogic\RemotePlayerManagerExtensions.cs" />
     <Compile Include="GameLogic\SeamothModulesEvent.cs" />
-    <Compile Include="GameLogic\Signs.cs" />
     <Compile Include="GameLogic\SimulationOwnership.cs" />
     <Compile Include="GameLogic\Spawning\SerializedEntitySpawner.cs" />
     <Compile Include="GameLogic\Spawning\ReefbackEntitySpawner.cs" />
diff --git a/NitroxModel/DataStructures/GameLogic/Buildings/Metadata/SignMetadata.cs b/NitroxModel/DataStructures/GameLogic/Buildings/Metadata/SignMetadata.cs
@@ -8,31 +8,27 @@ namespace NitroxModel.DataStructures.GameLogic.Buildings.Metadata
     public class SignMetadata : BasePieceMetadata
     {
         [ProtoMember(1)]
-        public NitroxId Id { get; }
-
-        [ProtoMember(2)]
         public string Text { get; set; }
 
-        [ProtoMember(3)]
+        [ProtoMember(2)]
         public int ColorIndex { get; set; }
 
-        [ProtoMember(4)]
+        [ProtoMember(3)]
         public int ScaleIndex { get; set; }
 
-        [ProtoMember(5)]
+        [ProtoMember(4)]
         public bool[] Elements { get; set; }
 
-        [ProtoMember(6)]
+        [ProtoMember(5)]
         public bool Background { get; set; }
 
         protected SignMetadata()
         {
             //Constructor for serialization. Has to be "protected" for json serialization.
         }
 
-        public SignMetadata(NitroxId id, string text, int colorIndex, int scaleIndex, bool[] elements, bool backgroundToggle)
+        public SignMetadata(string text, int colorIndex, int scaleIndex, bool[] elements, bool backgroundToggle)
         {
-            Id = id;
             Text = text;
             ColorIndex = colorIndex;
             ScaleIndex = scaleIndex;
@@ -42,7 +38,7 @@ public SignMetadata(NitroxId id, string text, int colorIndex, int scaleIndex, bo
 
         public override string ToString()
         {
-            return "[SignMetadata - Id: " + Id + " Text: " + Text + " ColorIndex: " + ColorIndex + "ScaleIndex: " + ScaleIndex + " Elements: " + Elements + " Background: " + Background + "]";
+            return "[SignMetadata - Text: " + Text + " ColorIndex: " + ColorIndex + "ScaleIndex: " + ScaleIndex + " Elements: " + Elements + " Background: " + Background + "]";
         }
     }
 }
diff --git a/NitroxModel/NitroxModel.csproj b/NitroxModel/NitroxModel.csproj
@@ -127,6 +127,7 @@
     <Compile Include="Packets\RadioPlayPendingMessage.cs" />
     <Compile Include="Packets\RemotePlayerEquipmentAdded.cs" />
     <Compile Include="Packets\RemotePlayerEquipmentRemoved.cs" />
+    <Compile Include="Packets\BasePieceMetadataChanged.cs" />
     <Compile Include="Packets\StorageSlotItemAdd.cs" />
     <Compile Include="Packets\StorageSlotItemRemove.cs" />
     <Compile Include="Packets\SubRootChanged.cs" />
@@ -198,7 +199,6 @@
     <Compile Include="Packets\Processors\Abstract\IProcessorContext.cs" />
     <Compile Include="Packets\Processors\Abstract\PacketProcessor.cs" />
     <Compile Include="Packets\SeamothModulesAction.cs" />
-    <Compile Include="Packets\SignChanged.cs" />
     <Compile Include="Packets\SimulationOwnershipChange.cs" />
     <Compile Include="Packets\SimulationOwnershipRequest.cs" />
     <Compile Include="Packets\SimulationOwnershipResponse.cs" />
diff --git a/NitroxModel/Packets/BasePieceMetadataChanged.cs b/NitroxModel/Packets/BasePieceMetadataChanged.cs
@@ -0,0 +1,19 @@
+﻿using System;
+using NitroxModel.DataStructures;
+using NitroxModel.DataStructures.GameLogic.Buildings.Metadata;
+
+namespace NitroxModel.Packets
+{
+    [Serializable]
+    public class BasePieceMetadataChanged : Packet
+    {
+        public NitroxId PieceId { get; }
+        public BasePieceMetadata Metadata { get; }
+
+        public BasePieceMetadataChanged(NitroxId pieceId, BasePieceMetadata metadata)
+        {
+            PieceId = pieceId;
+            Metadata = metadata;
+        }
+    }
+}
diff --git a/NitroxModel/Packets/SignChanged.cs b/NitroxModel/Packets/SignChanged.cs
diff --git a/NitroxPatcher/Patches/Dynamic/uGUI_SignInput_OnDeselect_Patch.cs b/NitroxPatcher/Patches/Dynamic/uGUI_SignInput_OnDeselect_Patch.cs
@@ -2,7 +2,11 @@
 using System.Reflection;
 using Harmony;
 using NitroxClient.GameLogic;
+using NitroxClient.MonoBehaviours;
 using NitroxModel.Core;
+using NitroxModel.DataStructures;
+using NitroxModel.DataStructures.GameLogic.Buildings.Metadata;
+using UnityEngine;
 
 namespace NitroxPatcher.Patches.Dynamic
 {
@@ -13,7 +17,11 @@ public class uGUI_SignInput_OnDeselect_Patch : NitroxPatch, IDynamicPatch
 
         public static void Postfix(uGUI_SignInput __instance)
         {
-            NitroxServiceLocator.LocateService<Signs>().Changed(__instance);
+            GameObject gameObject = __instance.gameObject.FindAncestor<PrefabIdentifier>().gameObject;
+            NitroxId id = NitroxEntity.GetId(gameObject);
+
+            SignMetadata signMetadata = new SignMetadata(__instance.text, __instance.colorIndex, __instance.scaleIndex, __instance.elementsState, __instance.IsBackground());
+            NitroxServiceLocator.LocateService<Building>().MetadataChanged(id, signMetadata);
         }
 
         public override void Patch(HarmonyInstance harmony)
diff --git a/NitroxServer/Communication/Packets/Processors/BasePieceMetadataChangedPacketProcessor.cs b/NitroxServer/Communication/Packets/Processors/BasePieceMetadataChangedPacketProcessor.cs
@@ -1,26 +1,24 @@
-﻿using NitroxModel.DataStructures.GameLogic.Buildings.Metadata;
-using NitroxModel.Packets;
+﻿using NitroxModel.Packets;
 using NitroxServer.Communication.Packets.Processors.Abstract;
 using NitroxServer.GameLogic;
 using NitroxServer.GameLogic.Bases;
 
 namespace NitroxServer.Communication.Packets.Processors
 {
-    public class SignChangedPacketProcessor : AuthenticatedPacketProcessor<SignChanged>
+    public class BasePieceMetadataChangedPacketProcessor : AuthenticatedPacketProcessor<BasePieceMetadataChanged>
     {
         private readonly BaseManager baseManager;
         private readonly PlayerManager playerManager;
         
-        public SignChangedPacketProcessor(BaseManager baseManager, PlayerManager playerManager)
+        public BasePieceMetadataChangedPacketProcessor(BaseManager baseManager, PlayerManager playerManager)
         {
             this.baseManager = baseManager;
             this.playerManager = playerManager;
         }
 
-        public override void Process(SignChanged packet, Player player)
+        public override void Process(BasePieceMetadataChanged packet, Player player)
         {
-            SignMetadata signMetadata = packet.SignMetadata;
-            baseManager.UpdateBasePieceMetadata(signMetadata.Id, signMetadata);
+            baseManager.UpdateBasePieceMetadata(packet.PieceId, packet.Metadata);
 
             playerManager.SendPacketToOtherPlayers(packet, player);
         }
diff --git a/NitroxServer/NitroxServer.csproj b/NitroxServer/NitroxServer.csproj
@@ -93,7 +93,7 @@
     <Compile Include="Communication\Packets\Processors\PlayerEquipmentAddedProcessor.cs" />
     <Compile Include="Communication\Packets\Processors\PlayerEquipmentRemovedProcessor.cs" />
     <Compile Include="Communication\Packets\Processors\RadioPlayPendingMessageProcessor.cs" />
-    <Compile Include="Communication\Packets\Processors\SignChangedPacketProcessor.cs" />
+    <Compile Include="Communication\Packets\Processors\BasePieceMetadataChangedPacketProcessor.cs" />
     <Compile Include="Communication\Packets\Processors\DeconstructionCompletedPacketProcessor.cs" />
     <Compile Include="Communication\Packets\Processors\DeconstructionBeginPacketProcessor.cs" />
     <Compile Include="Communication\Packets\Processors\ConstructionCompletedPacketProcessor.cs" />

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using NitroxClient.MonoBehaviours;`
`5`	`5`	`using NitroxModel.DataStructures;`
`6`	`6`	`using NitroxModel.DataStructures.GameLogic;`
	`7`	`+using NitroxModel.DataStructures.GameLogic.Buildings.Metadata;`
`7`	`8`	`using NitroxModel.DataStructures.GameLogic.Buildings.Rotation;`
`8`	`9`	`using NitroxModel.DataStructures.Util;`
`9`	`10`	`using NitroxModel.Helper;`
`@@ -212,5 +213,11 @@ public void DeconstructionComplete(GameObject gameObject)`
`212`	`213`	`DeconstructionCompleted deconstructionCompleted = new DeconstructionCompleted(id);`
`213`	`214`	`packetSender.Send(deconstructionCompleted);`
`214`	`215`	`}`
	`216`	`+`
	`217`	`+ public void MetadataChanged(NitroxId pieceId, BasePieceMetadata metadata)`
	`218`	`+ {`
	`219`	`+ BasePieceMetadataChanged changePacket = new BasePieceMetadataChanged(pieceId, metadata);`
	`220`	`+ packetSender.Send(changePacket);`
	`221`	`+ }`
`215`	`222`	`}`
`216`	`223`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,31 +8,27 @@ namespace NitroxModel.DataStructures.GameLogic.Buildings.Metadata`
`8`	`8`	`public class SignMetadata : BasePieceMetadata`
`9`	`9`	`{`
`10`	`10`	`[ProtoMember(1)]`
`11`		`- public NitroxId Id { get; }`
`12`		`-`
`13`		`- [ProtoMember(2)]`
`14`	`11`	`public string Text { get; set; }`
`15`	`12`
`16`		`- [ProtoMember(3)]`
	`13`	`+ [ProtoMember(2)]`
`17`	`14`	`public int ColorIndex { get; set; }`
`18`	`15`
`19`		`- [ProtoMember(4)]`
	`16`	`+ [ProtoMember(3)]`
`20`	`17`	`public int ScaleIndex { get; set; }`
`21`	`18`
`22`		`- [ProtoMember(5)]`
	`19`	`+ [ProtoMember(4)]`
`23`	`20`	`public bool[] Elements { get; set; }`
`24`	`21`
`25`		`- [ProtoMember(6)]`
	`22`	`+ [ProtoMember(5)]`
`26`	`23`	`public bool Background { get; set; }`
`27`	`24`
`28`	`25`	`protected SignMetadata()`
`29`	`26`	`{`
`30`	`27`	`//Constructor for serialization. Has to be "protected" for json serialization.`
`31`	`28`	`}`
`32`	`29`
`33`		`- public SignMetadata(NitroxId id, string text, int colorIndex, int scaleIndex, bool[] elements, bool backgroundToggle)`
	`30`	`+ public SignMetadata(string text, int colorIndex, int scaleIndex, bool[] elements, bool backgroundToggle)`
`34`	`31`	`{`
`35`		`- Id = id;`
`36`	`32`	`Text = text;`
`37`	`33`	`ColorIndex = colorIndex;`
`38`	`34`	`ScaleIndex = scaleIndex;`
`@@ -42,7 +38,7 @@ public SignMetadata(NitroxId id, string text, int colorIndex, int scaleIndex, bo`
`42`	`38`
`43`	`39`	`public override string ToString()`
`44`	`40`	`{`
`45`		`- return "[SignMetadata - Id: " + Id + " Text: " + Text + " ColorIndex: " + ColorIndex + "ScaleIndex: " + ScaleIndex + " Elements: " + Elements + " Background: " + Background + "]";`
	`41`	`+ return "[SignMetadata - Text: " + Text + " ColorIndex: " + ColorIndex + "ScaleIndex: " + ScaleIndex + " Elements: " + Elements + " Background: " + Background + "]";`
`46`	`42`	`}`
`47`	`43`	`}`
`48`	`44`	`}`