Merge branch 'dev' of https://github.com/Regalis11/Barotrauma.git into unstable-tests

Barotrauma/BarotraumaServer/ServerSource/Items/Components/DockingPort.cs

@@ -5,7 +5,7 @@ namespace Barotrauma.Items.Components
 {
     partial class DockingPort : ItemComponent, IDrawableComponent, IServerSerializable
     {
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
             msg.Write(docked);
 

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Door.cs

@@ -6,6 +6,16 @@ namespace Barotrauma.Items.Components
 {
     partial class Door
     {
+        private readonly struct EventData : IEventData
+        {
+            public readonly bool ForcedOpen;
+            
+            public EventData(bool forcedOpen)
+            {
+                ForcedOpen = forcedOpen;
+            }
+        }
+        
         partial void SetState(bool open, bool isNetworkMessage, bool sendNetworkMessage, bool forcedOpen)
         {
             if (IsStuck || isOpen == open)
@@ -19,17 +29,18 @@ namespace Barotrauma.Items.Components
 
             if (sendNetworkMessage)
             {
-                GameMain.Server.CreateEntityEvent(item, new object[] { NetEntityEvent.Type.ComponentState, item.GetComponentIndex(this), forcedOpen });
+                item.CreateServerEvent(this, new EventData(forcedOpen));
             }
         }
 
-        public override void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public override void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
-            base.ServerWrite(msg, c, extraData);
+            bool forcedOpen = TryExtractEventData<EventData>(extraData, out var eventData) && eventData.ForcedOpen;
+            base.ServerEventWrite(msg, c, extraData);
 
             msg.Write(isOpen);
             msg.Write(isBroken);
-            msg.Write(extraData.Length == 3 ? (bool)extraData[2] : false); //forced open
+            msg.Write(forcedOpen); //forced open
             msg.Write(isStuck);
             msg.Write(isJammed);
             msg.WriteRangedSingle(stuck, 0.0f, 100.0f, 8);

Barotrauma/BarotraumaServer/ServerSource/Items/Components/GeneticMaterial.cs

@@ -4,16 +4,16 @@ namespace Barotrauma.Items.Components
 {
     partial class GeneticMaterial : ItemComponent
     {
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
             msg.Write(tainted);
             if (tainted)
             {
-                msg.Write(selectedTaintedEffect?.UIntIdentifier ?? 0);
+                msg.Write(selectedTaintedEffect?.UintIdentifier ?? 0);
             }
             else
             {
-                msg.Write(selectedEffect?.UIntIdentifier ?? 0);
+                msg.Write(selectedEffect?.UintIdentifier ?? 0);
             }
         }
     }

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Growable.cs

@@ -6,12 +6,22 @@ namespace Barotrauma.Items.Components
 {
     internal partial class Growable
     {
+        private readonly struct EventData : IEventData
+        {
+            public readonly int Offset;
+            
+            public EventData(int offset)
+            {
+                Offset = offset;
+            }
+        }
+        
         private const int serverHealthUpdateDelay = 10;
         private int serverHealthUpdateTimer;
 
-        partial void LoadVines(XElement element)
+        partial void LoadVines(ContentXElement element)
         {
-            foreach (XElement subElement in element.Elements())
+            foreach (var subElement in element.Elements())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
                 {
@@ -25,11 +35,12 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
             msg.WriteRangedSingle(Health, 0f, (float) MaxHealth, 8);
-            if (extraData != null && extraData.Length >= 3 && extraData[2] is int offset)
+            if (TryExtractEventData(extraData, out EventData eventData))
             {
+                int offset = eventData.Offset;
                 int amountToSend = Math.Min(Vines.Count - offset, VineChunkSize);
                 msg.WriteRangedInteger(offset, -1, MaximumVines);
                 msg.WriteRangedInteger(amountToSend, 0, VineChunkSize);

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Holdable/Holdable.cs

@@ -5,9 +5,9 @@ namespace Barotrauma.Items.Components
 {
     partial class Holdable : Pickable, IServerSerializable, IClientSerializable
     {
-        public override void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public override void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
-            base.ServerWrite(msg, c, extraData);
+            base.ServerEventWrite(msg, c, extraData);
 
             bool writeAttachData = attachable && body != null;
             msg.Write(writeAttachData);
@@ -19,7 +19,7 @@ namespace Barotrauma.Items.Components
             msg.Write(item.Submarine?.ID ?? Entity.NullEntityID);
         }
 
-        public void ServerRead(ClientNetObject type, IReadMessage msg, Client c)
+        public void ServerEventRead(IReadMessage msg, Client c)
         {
             Vector2 simPosition = new Vector2(msg.ReadSingle(), msg.ReadSingle());
 

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Holdable/LevelResource.cs

@@ -6,7 +6,7 @@ namespace Barotrauma.Items.Components
     {
         private float lastSentDeattachTimer;
 
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
             msg.Write(deattachTimer);
         }

Barotrauma/BarotraumaServer/ServerSource/Items/Components/ItemComponent.cs

@@ -1,10 +1,12 @@
-using System.Xml.Linq;
+using System;
+using System.Xml.Linq;
+using Barotrauma.Networking;
 
 namespace Barotrauma.Items.Components
 {
     partial class ItemComponent : ISerializableEntity
     {
-        private bool LoadElemProjSpecific(XElement subElement)
+        private bool LoadElemProjSpecific(ContentXElement subElement)
         {
             switch (subElement.Name.ToString().ToLowerInvariant())
             {
@@ -18,7 +20,7 @@ namespace Barotrauma.Items.Components
             return true; //element processed
         }
 
-        public virtual void ServerAppendExtraData(ref object[] extraData) { }
+        public virtual IEventData ServerGetEventData() => null;
     }
 
 }

Barotrauma/BarotraumaServer/ServerSource/Items/Components/ItemLabel.cs

@@ -11,28 +11,28 @@ namespace Barotrauma.Items.Components
         private string lastSentText;
         private float sendStateTimer;
 
-        [Serialize("", true, description: "The text to display on the label.", alwaysUseInstanceValues: true), Editable(100)]
+        [Serialize("", IsPropertySaveable.Yes, description: "The text to display on the label.", alwaysUseInstanceValues: true), Editable(100)]
         public string Text
         {
             get;
             set;
         }
 
-        [Editable, Serialize("0,0,0,255", true, description: "The color of the text displayed on the label.", alwaysUseInstanceValues: true)]
+        [Editable, Serialize("0,0,0,255", IsPropertySaveable.Yes, description: "The color of the text displayed on the label.", alwaysUseInstanceValues: true)]
         public Color TextColor
         {
             get;
             set;
         }
         
-        [Editable, Serialize(1.0f, true, description: "The scale of the text displayed on the label.", alwaysUseInstanceValues: true)]
+        [Editable, Serialize(1.0f, IsPropertySaveable.Yes, description: "The scale of the text displayed on the label.", alwaysUseInstanceValues: true)]
         public float TextScale
         {
             get;
             set;
         }
 
-        [Serialize("0,0,0,0", true, description: "The amount of padding around the text in pixels (left,top,right,bottom).")]
+        [Serialize("0,0,0,0", IsPropertySaveable.Yes, description: "The amount of padding around the text in pixels (left,top,right,bottom).")]
         public Vector4 Padding
         {
             get;
@@ -44,7 +44,7 @@ namespace Barotrauma.Items.Components
             //do nothing
         }
 
-        public ItemLabel(Item item, XElement element)
+        public ItemLabel(Item item, ContentXElement element)
             : base(item, element)
         {
         }
@@ -76,7 +76,7 @@ namespace Barotrauma.Items.Components
             yield return CoroutineStatus.Success;
         }
 
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
             msg.Write(Text);
             lastSentText = Text;

Barotrauma/BarotraumaServer/ServerSource/Items/Components/LightComponent.cs

@@ -36,7 +36,7 @@ namespace Barotrauma.Items.Components
             yield return CoroutineStatus.Success;
         }
 
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
             msg.Write(IsActive);
             lastSentState = IsActive;

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Machines/Controller.cs

@@ -4,7 +4,7 @@ namespace Barotrauma.Items.Components
 {
     partial class Controller : ItemComponent, IServerSerializable
     {
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
             msg.Write(State);
             msg.Write(user == null ? (ushort)0 : user.ID);

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Machines/Deconstructor.cs

@@ -4,7 +4,7 @@ namespace Barotrauma.Items.Components
 {
     partial class Deconstructor : Powered, IServerSerializable, IClientSerializable
     {
-        public void ServerRead(ClientNetObject type, IReadMessage msg, Client c)
+        public void ServerEventRead(IReadMessage msg, Client c)
         {
             bool active = msg.ReadBoolean();
 
@@ -16,7 +16,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
             msg.Write(user?.ID ?? 0);
             msg.Write(IsActive);

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Machines/Engine.cs

@@ -5,14 +5,14 @@ namespace Barotrauma.Items.Components
 {
     partial class Engine : Powered, IServerSerializable, IClientSerializable
     {
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
             //force can only be adjusted at 10% intervals -> no need for more accuracy than this
             msg.WriteRangedInteger((int)(targetForce / 10.0f), -10, 10);
             msg.Write(User == null ? Entity.NullEntityID : User.ID);
         }
 
-        public void ServerRead(ClientNetObject type, IReadMessage msg, Client c)
+        public void ServerEventRead(IReadMessage msg, Client c)
         {
             float newTargetForce = msg.ReadRangedInteger(-10, 10) * 10.0f;
 

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Machines/Fabricator.cs

@@ -1,57 +1,73 @@
 using Barotrauma.Networking;
-using Microsoft.Xna.Framework;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
     partial class Fabricator : Powered, IServerSerializable, IClientSerializable
     {
-        public void ServerRead(ClientNetObject type, IReadMessage msg, Client c)
+        public void ServerEventRead(IReadMessage msg, Client c)
         {
-            int itemIndex = msg.ReadRangedInteger(-1, fabricationRecipes.Count - 1);
+            uint recipeHash = msg.ReadUInt32();
 
             item.CreateServerEvent(this);
 
-            if (!item.CanClientAccess(c)) return;
+            if (!item.CanClientAccess(c)) { return; }
 
-            if (itemIndex == -1)
+            if (recipeHash == 0)
             {
                 CancelFabricating(c.Character);
             }
             else
             {
                 //if already fabricating the selected item, return
-                if (fabricatedItem != null && fabricationRecipes.IndexOf(fabricatedItem) == itemIndex) return;
-                if (itemIndex < 0 || itemIndex >= fabricationRecipes.Count) return;
+                if (fabricatedItem != null && fabricatedItem.RecipeHash == recipeHash) { return; }
+                if (recipeHash == 0) { return; }
 
-                StartFabricating(fabricationRecipes[itemIndex], c.Character);
+                StartFabricating(fabricationRecipes[recipeHash], c.Character);
             }
         }
 
         private ulong serverEventId = 0;
-        public override void ServerAppendExtraData(ref object[] extraData)
-        {
-            //ensuring the uniqueness of this event is
-            //required for the fabricator to sync correctly;
-            //otherwise, the event manager would incorrectly
-            //assume that the client actually has the latest state
-            Array.Resize(ref extraData, 4);
-            extraData[2] = serverEventId;
-            extraData[3] = State;
-        }
 
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        private readonly struct EventData : IEventData
         {
-            FabricatorState stateAtEvent = (FabricatorState)extraData[3];
-            msg.Write((byte)stateAtEvent);
+            public readonly ulong ServerEventId;
+            public readonly FabricatorState State;
+
+            public EventData(ulong serverEventId, FabricatorState state)
+            {
+                //ensuring the uniqueness of this event is
+                //required for the fabricator to sync correctly;
+                //otherwise, the event manager would incorrectly
+                //assume that the client actually has the latest state
+                ServerEventId = serverEventId;
+                State = state;
+            }
+        }
+        
+        public override IEventData ServerGetEventData()
+            => new EventData(serverEventId, State);
+
+        public override bool ValidateEventData(NetEntityEvent.IData data)
+            => TryExtractEventData<EventData>(data, out _);
+
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
+        {
+            var componentData = ExtractEventData<EventData>(extraData);
+            msg.Write((byte)componentData.State);
             msg.Write(timeUntilReady);
-            int itemIndex = fabricatedItem == null ? -1 : fabricationRecipes.IndexOf(fabricatedItem);
-            msg.WriteRangedInteger(itemIndex, -1, fabricationRecipes.Count - 1);
-            UInt16 userID = fabricatedItem == null || user == null ? (UInt16)0 : user.ID;
+            uint recipeHash = fabricatedItem?.RecipeHash ?? 0;
+            msg.Write(recipeHash);
+            UInt16 userID = fabricatedItem is null || user is null ? (UInt16)0 : user.ID;
             msg.Write(userID);
+
+            var reachedLimits = fabricationLimits.Where(kvp => kvp.Value <= 0);
+            msg.Write((ushort)reachedLimits.Count());
+            foreach (var kvp in reachedLimits)
+            {
+                msg.Write(kvp.Key);
+            }
         }
     }
 }

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Machines/OutpostTerminal.cs

@@ -4,12 +4,12 @@ namespace Barotrauma.Items.Components
 {
     partial class OutpostTerminal : ItemComponent, IClientSerializable, IServerSerializable    
     {
-        public void ServerRead(ClientNetObject type, IReadMessage msg, Client c)
+        public void ServerEventRead(IReadMessage msg, Client c)
         {
             
         }
 
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
 
         }

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Machines/Pump.cs

@@ -8,7 +8,7 @@ namespace Barotrauma.Items.Components
 {
     partial class Pump : Powered, IServerSerializable, IClientSerializable
     {
-        public void ServerRead(ClientNetObject type, IReadMessage msg, Client c)
+        public void ServerEventRead(IReadMessage msg, Client c)
         {
             float newFlowPercentage = msg.ReadRangedInteger(-10, 10) * 10.0f;
             bool newIsActive = msg.ReadBoolean();
@@ -36,7 +36,7 @@ namespace Barotrauma.Items.Components
             item.CreateServerEvent(this);
         }
 
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
             //flowpercentage can only be adjusted at 10% intervals -> no need for more accuracy than this
             msg.WriteRangedInteger((int)(flowPercentage / 10.0f), -10, 10);

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Machines/Reactor.cs

@@ -12,7 +12,7 @@ namespace Barotrauma.Items.Components
         private float? nextServerLogWriteTime;
         private float lastServerLogWriteTime;
 
-        public void ServerRead(ClientNetObject type, IReadMessage msg, Client c)
+        public void ServerEventRead(IReadMessage msg, Client c)
         {
             bool autoTemp = msg.ReadBoolean();
             bool powerOn = msg.ReadBoolean();
@@ -43,7 +43,7 @@ namespace Barotrauma.Items.Components
             unsentChanges = true;
         }
 
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
             msg.Write(autoTemp);
             msg.Write(_powerOn);

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Machines/Steering.cs

@@ -5,6 +5,16 @@ namespace Barotrauma.Items.Components
 {
     partial class Steering : Powered, IServerSerializable, IClientSerializable
     {
+        private readonly struct EventData : IEventData
+        {
+            public readonly bool DockingButtonClicked;
+            
+            public EventData(bool dockingButtonClicked)
+            {
+                DockingButtonClicked = dockingButtonClicked;
+            }
+        }
+        
         // TODO: an enumeration would be much cleaner
         public bool MaintainPos;
         public bool LevelStartSelected;
@@ -23,7 +33,7 @@ namespace Barotrauma.Items.Components
         }
 
 
-        public void ServerRead(ClientNetObject type, IReadMessage msg, Barotrauma.Networking.Client c)
+        public void ServerEventRead(IReadMessage msg, Client c)
         {
             bool autoPilot = msg.ReadBoolean();
             bool dockingButtonClicked = msg.ReadBoolean();
@@ -58,7 +68,7 @@ namespace Barotrauma.Items.Components
             if (dockingButtonClicked)
             {
                 item.SendSignal(new Signal("1", sender: c.Character), "toggle_docking");
-                GameMain.Server.CreateEntityEvent(item, new object[] { NetEntityEvent.Type.ComponentState, item.GetComponentIndex(this), true });
+                item.CreateServerEvent(this, new EventData(dockingButtonClicked: true));
             }
 
             if (!AutoPilot)
@@ -88,10 +98,10 @@ namespace Barotrauma.Items.Components
             unsentChanges = true;
         }
 
-        public void ServerWrite(IWriteMessage msg, Barotrauma.Networking.Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Barotrauma.Networking.Client c, NetEntityEvent.IData extraData = null)
         {
             msg.Write(autoPilot);
-            msg.Write(extraData.Length > 2 && extraData[2] is bool && (bool)extraData[2]);
+            msg.Write(TryExtractEventData<EventData>(extraData, out var eventData) && eventData.DockingButtonClicked);
 
             if (!autoPilot)
             {

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Power/PowerContainer.cs

@@ -7,7 +7,7 @@ namespace Barotrauma.Items.Components
 {
     partial class PowerContainer : Powered, IDrawableComponent, IServerSerializable, IClientSerializable
     {
-        public void ServerRead(ClientNetObject type, IReadMessage msg, Client c)
+        public void ServerEventRead(IReadMessage msg, Client c)
         {
             float newRechargeSpeed = msg.ReadRangedInteger(0, 10) / 10.0f * maxRechargeSpeed;
 
@@ -20,7 +20,7 @@ namespace Barotrauma.Items.Components
             item.CreateServerEvent(this);
         }
 
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
             msg.WriteRangedInteger((int)(rechargeSpeed / MaxRechargeSpeed * 10), 0, 10);
 

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Projectile.cs

@@ -5,11 +5,26 @@ namespace Barotrauma.Items.Components
 {
     partial class Projectile : ItemComponent
     {
+        private readonly struct EventData : IEventData
+        {
+            public readonly bool Launch;
+            
+            public EventData(bool launch)
+            {
+                Launch = launch;
+            }
+        }
+        
         private float launchRot;
 
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public override bool ValidateEventData(NetEntityEvent.IData data)
+            => TryExtractEventData<EventData>(data, out _);
+
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
-            bool launch = extraData.Length > 2 && (bool)extraData[2];
+            var eventData = ExtractEventData<EventData>(extraData);
+            bool launch = eventData.Launch;
+            
             msg.Write(launch);
             if (launch)
             {
@@ -27,8 +42,8 @@ namespace Barotrauma.Items.Components
                 msg.Write(item.CurrentHull?.ID ?? Entity.NullEntityID);
                 msg.Write(item.SimPosition.X);
                 msg.Write(item.SimPosition.Y);
-                msg.Write(stickJoint.Axis.X);
-                msg.Write(stickJoint.Axis.Y);
+                msg.Write(jointAxis.X);
+                msg.Write(jointAxis.Y);
                 if (StickTarget.UserData is Structure structure)
                 {
                     msg.Write(structure.ID);

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Repairable.cs

@@ -4,13 +4,16 @@ namespace Barotrauma.Items.Components
 {
     partial class Repairable : ItemComponent, IServerSerializable, IClientSerializable
     {
-        void InitProjSpecific()
+        private Character prevLoggedFixer;
+        private FixActions prevLoggedFixAction;
+
+        public override void OnMapLoaded()
         {
             //let the clients know the initial deterioration delay
             item.CreateServerEvent(this);
         }
 
-        public void ServerRead(ClientNetObject type, IReadMessage msg, Client c)
+        public void ServerEventRead(IReadMessage msg, Client c)
         {
             if (c.Character == null) { return; }
             var requestedFixAction = (FixActions)msg.ReadRangedInteger(0, 2);
@@ -19,7 +22,7 @@ namespace Barotrauma.Items.Components
             {
                 if (!c.Character.IsTraitor && requestedFixAction == FixActions.Sabotage)
                 {
-                    if (GameSettings.VerboseLogging)
+                    if (GameSettings.CurrentConfig.VerboseLogging)
                     {
                         DebugConsole.Log($"Non traitor \"{c.Character.Name}\" attempted to sabotage item.");
                     }
@@ -39,7 +42,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
             msg.Write(deteriorationTimer);
             msg.Write(deteriorateAlwaysResetTimer);

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Rope.cs

@@ -4,7 +4,7 @@ namespace Barotrauma.Items.Components
 {
     partial class Rope : ItemComponent
     {
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
             msg.Write(Snapped);
 

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Scanner.cs

@@ -6,7 +6,7 @@ namespace Barotrauma.Items.Components
     {
         private float LastSentScanTimer { get; set; }
 
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
             msg.Write(scanTimer);
         }

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Signal/ButtonTerminal.cs

@@ -4,16 +4,16 @@ namespace Barotrauma.Items.Components
 {
     partial class ButtonTerminal : ItemComponent, IClientSerializable, IServerSerializable
     {
-        public void ServerRead(ClientNetObject type, IReadMessage msg, Client c)
+        public void ServerEventRead(IReadMessage msg, Client c)
         {
             int signalIndex = msg.ReadRangedInteger(0, Signals.Length - 1);
             if (!item.CanClientAccess(c)) { return; }
             if (!SendSignal(signalIndex, c.Character)) { return; }
             GameServer.Log($"{GameServer.CharacterLogName(c.Character)} sent a signal \"{Signals[signalIndex]}\" from {item.Name}", ServerLog.MessageType.ItemInteraction);
-            item.CreateServerEvent(this, new object[] { signalIndex });
+            item.CreateServerEvent(this, new EventData(signalIndex));
         }
 
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
             Write(msg, extraData);
         }

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Signal/ConnectionPanel.cs

@@ -7,7 +7,7 @@ namespace Barotrauma.Items.Components
 {
     partial class ConnectionPanel : ItemComponent, IServerSerializable, IClientSerializable
     {
-        public void ServerRead(ClientNetObject type, IReadMessage msg, Client c)
+        public void ServerEventRead(IReadMessage msg, Client c)
         {
             List<Wire>[] wires = new List<Wire>[Connections.Count];
 
@@ -84,7 +84,7 @@ namespace Barotrauma.Items.Components
                         if (!selectedWire.Item.Removed) { selectedWire.CreateNetworkEvent(); }
                     }, 1.0f);
                 }
-                GameMain.Server?.CreateEntityEvent(item, new object[] { NetEntityEvent.Type.ApplyStatusEffect, ActionType.OnFailure, this, c.Character.ID });
+                GameMain.Server?.CreateEntityEvent(item, new Item.ApplyStatusEffectEventData(ActionType.OnFailure, this, c.Character));
                 return;
             }
 
@@ -210,10 +210,10 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
             msg.Write(user == null ? (ushort)0 : user.ID);
-            ClientWrite(msg, extraData);
+            ClientEventWrite(msg, extraData);
         }
     }
 }

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Signal/CustomInterface.cs

@@ -5,7 +5,7 @@ namespace Barotrauma.Items.Components
 {
     partial class CustomInterface : ItemComponent, IClientSerializable, IServerSerializable
     {
-        public void ServerRead(ClientNetObject type, IReadMessage msg, Client c)
+        public void ServerEventRead(IReadMessage msg, Client c)
         {
             bool[] elementStates = new bool[customInterfaceElementList.Count];
             string[] elementValues = new string[customInterfaceElementList.Count];
@@ -51,17 +51,12 @@ namespace Barotrauma.Items.Components
             }
 
             //notify all clients of the new state
-            GameMain.Server.CreateEntityEvent(item, new object[]
-            {
-                NetEntityEvent.Type.ComponentState,
-                item.GetComponentIndex(this),
-                clickedButton
-            });
+            item.CreateServerEvent(this, new EventData(clickedButton));
 
             item.CreateServerEvent(this);
         }
 
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
             //extradata contains an array of buttons clicked by a client (or nothing if nothing was clicked)
             for (int i = 0; i < customInterfaceElementList.Count; i++)
@@ -76,7 +71,7 @@ namespace Barotrauma.Items.Components
                 }
                 else
                 {
-                    msg.Write(extraData != null && extraData.Any(d => d as CustomInterfaceElement == customInterfaceElementList[i]));
+                    msg.Write(extraData is Item.ComponentStateEventData { ComponentData: EventData eventData } && eventData.BtnElement == customInterfaceElementList[i]);
                 }
             }
         }

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Signal/MemoryComponent.cs

@@ -36,7 +36,7 @@ namespace Barotrauma.Items.Components
             yield return CoroutineStatus.Success;
         }
 
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
             msg.Write(Value);
             lastSentValue = Value;

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Signal/Terminal.cs

@@ -7,7 +7,19 @@ namespace Barotrauma.Items.Components
 {
     partial class Terminal : ItemComponent, IClientSerializable, IServerSerializable
     {
-        public void ServerRead(ClientNetObject type, IReadMessage msg, Client c)
+        private readonly struct ServerEventData : IEventData
+        {
+            public readonly int MsgIndex;
+            public readonly string MsgToSend;
+            
+            public ServerEventData(int msgIndex, string msgToSend)
+            {
+                MsgIndex = msgIndex;
+                MsgToSend = msgToSend;
+            }
+        }
+        
+        public void ServerEventRead(IReadMessage msg, Client c)
         {
             string newOutputValue = msg.ReadString();
 
@@ -47,7 +59,7 @@ namespace Barotrauma.Items.Components
                 string msgToSend = str;
                 if (string.IsNullOrEmpty(msgToSend))
                 {
-                    item.CreateServerEvent(this, new object[] { msgIndex, msgToSend });
+                    item.CreateServerEvent(this, new ServerEventData(msgIndex, msgToSend));
                     msgIndex++;
                     continue;
                 }
@@ -73,23 +85,23 @@ namespace Barotrauma.Items.Components
                             if (!splitMessage.Any()) { break; }
                             tempMsg += " ";
                         } while (tempMsg.Length + splitMessage[0].Length < MaxMessageLength);
-                        item.CreateServerEvent(this, new object[] { msgIndex, tempMsg });
+                        item.CreateServerEvent(this, new ServerEventData(msgIndex, tempMsg));
                         msgToSend = msgToSend.Remove(0, tempMsg.Length);
                     }
                 }
                 if (!string.IsNullOrEmpty(msgToSend))
                 {
-                    item.CreateServerEvent(this, new object[] { msgIndex, msgToSend });
+                    item.CreateServerEvent(this, new ServerEventData(msgIndex, msgToSend));
                 }
                 msgIndex++;
             }
         }
 
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
-            if (extraData.Length > 3 && extraData[3] is string str)
+            if (TryExtractEventData(extraData, out ServerEventData eventData))
             {
-                msg.Write(str);
+                msg.Write(eventData.MsgToSend);
             }
             else
             {

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Signal/WifiComponent.cs

@@ -4,7 +4,7 @@ namespace Barotrauma.Items.Components
 {
     partial class WifiComponent
     {
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
             msg.WriteRangedInteger(Channel, MinChannel, MaxChannel);
         }

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Signal/Wire.cs

@@ -6,6 +6,16 @@ namespace Barotrauma.Items.Components
 {
     partial class Wire : ItemComponent, IDrawableComponent, IServerSerializable
     {
+        private readonly struct ServerEventData : IEventData
+        {
+            public readonly int EventIndex;
+            
+            public ServerEventData(int eventIndex)
+            {
+                EventIndex = eventIndex;
+            }
+        }
+        
         public void CreateNetworkEvent()
         {
             if (GameMain.Server == null) return;
@@ -13,13 +23,17 @@ namespace Barotrauma.Items.Components
             int eventCount = Math.Max((int)Math.Ceiling(nodes.Count / (float)MaxNodesPerNetworkEvent), 1);
             for (int i = 0; i < eventCount; i++)
             {
-                GameMain.Server.CreateEntityEvent(item, new object[] { NetEntityEvent.Type.ComponentState, item.GetComponentIndex(this), i });
+                item.CreateServerEvent(this, new ServerEventData(i));
             }
         }
 
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public override bool ValidateEventData(NetEntityEvent.IData data)
+            => TryExtractEventData<ServerEventData>(data, out _);
+
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
-            int eventIndex = (int)extraData[2];
+            var eventData = ExtractEventData<ServerEventData>(extraData);
+            int eventIndex = eventData.EventIndex;
             int nodeStartIndex = eventIndex * MaxNodesPerNetworkEvent;
             int nodeCount = MathHelper.Clamp(nodes.Count - nodeStartIndex, 0, MaxNodesPerNetworkEvent);
 
@@ -32,7 +46,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public void ServerRead(ClientNetObject type, IReadMessage msg, Client c)
+        public void ServerEventRead(IReadMessage msg, Client c)
         {
             int nodeCount = msg.ReadByte();
             Vector2 lastNodePos = Vector2.Zero;

Barotrauma/BarotraumaServer/ServerSource/Items/Components/TriggerComponent.cs

@@ -4,7 +4,7 @@ namespace Barotrauma.Items.Components
 {
     partial class TriggerComponent : ItemComponent, IServerSerializable
     {
-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
         {
             msg.WriteRangedSingle(CurrentForceFluctuation, 0.0f, 1.0f, 8);
         }