Sending NetEntityEvents from client to server, ItemComponent class doesn't implement the INetSerializable interfaces (only the derived classes do), reactor syncing

Subsurface/Source/Items/Components/DockingPort.cs

@@ -648,7 +648,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public override void ServerWrite(Lidgren.Network.NetBuffer msg, Barotrauma.Networking.Client c, object[] extraData = null)
+        public void ServerWrite(Lidgren.Network.NetBuffer msg, Barotrauma.Networking.Client c, object[] extraData = null)
         {
             msg.Write(docked);
 
@@ -662,7 +662,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public override void ClientRead(Lidgren.Network.NetIncomingMessage msg, float sendingTime)
+        public void ClientRead(Lidgren.Network.NetIncomingMessage msg, float sendingTime)
         {
             bool isDocked = msg.ReadBoolean();
 

Subsurface/Source/Items/Components/Door.cs

@@ -7,10 +7,11 @@ using FarseerPhysics.Factories;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Barotrauma.Lights;
+using Barotrauma.Networking;
 
 namespace Barotrauma.Items.Components
 {
-    class Door : ItemComponent, IDrawableComponent
+    class Door : ItemComponent, IDrawableComponent, IServerSerializable
     {
         private Gap linkedGap;
 
@@ -493,13 +494,13 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public override void ServerWrite(Lidgren.Network.NetBuffer msg, Barotrauma.Networking.Client c, object[] extraData = null)
+        public void ServerWrite(Lidgren.Network.NetBuffer msg, Barotrauma.Networking.Client c, object[] extraData = null)
         {
             msg.Write(isOpen);
             msg.WriteRangedSingle(stuck, 0.0f, 100.0f, 8);
         }
 
-        public override void ClientRead(Lidgren.Network.NetIncomingMessage msg, float sendingTime)
+        public void ClientRead(Lidgren.Network.NetIncomingMessage msg, float sendingTime)
         {
             SetState(msg.ReadBoolean(), true);
             Stuck = msg.ReadRangedSingle(0.0f, 100.0f, 8);

Subsurface/Source/Items/Components/ItemComponent.cs

@@ -43,7 +43,7 @@ namespace Barotrauma.Items.Components
     /// <summary>
     /// The base class for components holding the different functionalities of the item
     /// </summary>
-    class ItemComponent : IPropertyObject, IClientSerializable, IServerSerializable
+    class ItemComponent : IPropertyObject
     {
         protected Item item;
 
@@ -662,12 +662,6 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public virtual void ClientWrite(NetBuffer msg, object[] extraData = null) { }
-        public virtual void ServerRead(NetIncomingMessage msg, Client c) { }
-
-        public virtual void ServerWrite(NetBuffer msg, Client c, object[] extraData = null) { }
-        public virtual void ClientRead(NetIncomingMessage msg, float sendingTime) { }
-        
         public virtual XElement Save(XElement parentElement)
         {
             XElement componentElement = new XElement(name);

Subsurface/Source/Items/Components/Machines/Pump.cs

@@ -196,27 +196,27 @@ namespace Barotrauma.Items.Components
             if (!IsActive) currPowerConsumption = 0.0f;
         }
 
-        public override void ClientWrite(Lidgren.Network.NetBuffer msg, object[] extraData = null)
+        public void ClientWrite(Lidgren.Network.NetBuffer msg, object[] extraData = null)
         {
             //flowpercentage can only be adjusted at 10% intervals -> no need for more accuracy than this
             msg.WriteRangedInteger(-10, 10, (int)(flowPercentage / 10.0f));
             msg.Write(IsActive);
         }
 
-        public override void ServerRead(Lidgren.Network.NetIncomingMessage msg, Barotrauma.Networking.Client c)
+        public void ServerRead(Lidgren.Network.NetIncomingMessage msg, Barotrauma.Networking.Client c)
         {
             FlowPercentage = msg.ReadRangedInteger(-10, 10) * 10.0f;
             IsActive = msg.ReadBoolean();
         }
 
-        public override void ServerWrite(Lidgren.Network.NetBuffer msg, Barotrauma.Networking.Client c, object[] extraData = null)
+        public void ServerWrite(Lidgren.Network.NetBuffer msg, Barotrauma.Networking.Client c, object[] extraData = null)
         {
             //flowpercentage can only be adjusted at 10% intervals -> no need for more accuracy than this
             msg.WriteRangedInteger(-10, 10, (int)(flowPercentage / 10.0f));
             msg.Write(IsActive);
         }
 
-        public override void ClientRead(Lidgren.Network.NetIncomingMessage msg, float sendingTime)
+        public void ClientRead(Lidgren.Network.NetIncomingMessage msg, float sendingTime)
         {
             FlowPercentage = msg.ReadRangedInteger(-10, 10) * 10.0f;
             IsActive = msg.ReadBoolean();

Subsurface/Source/Items/Components/Machines/Radar.cs

@@ -411,23 +411,23 @@ namespace Barotrauma.Items.Components
             if (screenOverlay != null) screenOverlay.Remove();
         }
 
-        public override void ClientWrite(Lidgren.Network.NetBuffer msg, object[] extraData = null)
+        public void ClientWrite(Lidgren.Network.NetBuffer msg, object[] extraData = null)
         {
             msg.Write(IsActive);
         }
 
-        public override void ServerRead(Lidgren.Network.NetIncomingMessage msg, Barotrauma.Networking.Client c)
+        public void ServerRead(Lidgren.Network.NetIncomingMessage msg, Barotrauma.Networking.Client c)
         {
             IsActive = msg.ReadBoolean();
             isActiveTickBox.Selected = IsActive;
         }
 
-        public override void ServerWrite(Lidgren.Network.NetBuffer msg, Barotrauma.Networking.Client c, object[] extraData = null)
+        public void ServerWrite(Lidgren.Network.NetBuffer msg, Barotrauma.Networking.Client c, object[] extraData = null)
         {
             msg.Write(IsActive);
         }
 
-        public override void ClientRead(Lidgren.Network.NetIncomingMessage msg, float sendingTime)
+        public void ClientRead(Lidgren.Network.NetIncomingMessage msg, float sendingTime)
         {
             IsActive = msg.ReadBoolean();
             isActiveTickBox.Selected = IsActive;

Subsurface/Source/Items/Components/Machines/Reactor.cs

@@ -8,7 +8,7 @@ using Barotrauma.Networking;
 
 namespace Barotrauma.Items.Components
 {
-    class Reactor : Powered, IDrawableComponent
+    class Reactor : Powered, IDrawableComponent, IServerSerializable, IClientSerializable
     {
         const float NetworkUpdateInterval = 3.0f;
 
@@ -324,6 +324,15 @@ namespace Barotrauma.Items.Components
 
             if (unsentChanges && sendUpdateTimer<= 0.0f)
             {
+                if (GameMain.Server != null)
+                {
+                    item.CreateServerEvent(this);
+                }
+                else if (GameMain.Client != null)
+                {
+                    item.CreateClientEvent(this);
+                }
+
                 sendUpdateTimer = NetworkUpdateInterval;
                 unsentChanges = false;
             }            
@@ -538,7 +547,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public override void ClientWrite(NetBuffer msg, object[] extraData = null)
+        public void ClientWrite(NetBuffer msg, object[] extraData = null)
         {
             msg.Write(autoTemp);
             msg.WriteRangedSingle(shutDownTemp, 0.0f, 10000.0f, 8);
@@ -547,16 +556,19 @@ namespace Barotrauma.Items.Components
             msg.WriteRangedSingle(fissionRate, 0.0f, 100.0f, 8);
         }
 
-        public override void ServerRead(NetIncomingMessage msg, Client c)
+        public void ServerRead(NetIncomingMessage msg, Client c)
         {
-            autoTemp = msg.ReadBoolean();
+            AutoTemp = msg.ReadBoolean();
             ShutDownTemp = msg.ReadRangedSingle(0.0f, 10000.0f, 8);
 
             CoolingRate = msg.ReadRangedSingle(0.0f, 100.0f, 8);
             FissionRate = msg.ReadRangedSingle(0.0f, 100.0f, 8);
+
+            //need to create a server event to notify all clients of the changed state
+            unsentChanges = true;
         }
 
-        public override void ServerWrite(NetBuffer msg, Client c, object[] extraData = null)
+        public void ServerWrite(NetBuffer msg, Client c, object[] extraData = null)
         {
             msg.WriteRangedSingle(temperature, 0.0f, 10000.0f, 16);
 
@@ -567,11 +579,11 @@ namespace Barotrauma.Items.Components
             msg.WriteRangedSingle(fissionRate, 0.0f, 100.0f, 8);
         }
 
-        public override void ClientRead(NetIncomingMessage msg, float sendingTime)
+        public void ClientRead(NetIncomingMessage msg, float sendingTime)
         {
             Temperature = msg.ReadRangedSingle(0.0f, 10000.0f, 16);
 
-            autoTemp = msg.ReadBoolean();
+            AutoTemp = msg.ReadBoolean();
             ShutDownTemp = msg.ReadRangedSingle(0.0f, 10000.0f, 8);
 
             CoolingRate = msg.ReadRangedSingle(0.0f, 100.0f, 8);

Subsurface/Source/Items/Components/Machines/Steering.cs

@@ -443,7 +443,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public override void ClientWrite(Lidgren.Network.NetBuffer msg, object[] extraData = null)
+        public void ClientWrite(Lidgren.Network.NetBuffer msg, object[] extraData = null)
         {
             msg.Write(autoPilot);
 
@@ -468,7 +468,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public override void ServerRead(Lidgren.Network.NetIncomingMessage msg, Barotrauma.Networking.Client c)
+        public void ServerRead(Lidgren.Network.NetIncomingMessage msg, Barotrauma.Networking.Client c)
         {
             AutoPilot = msg.ReadBoolean();
 
@@ -503,7 +503,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public override void ServerWrite(Lidgren.Network.NetBuffer msg, Barotrauma.Networking.Client c, object[] extraData = null)
+        public void ServerWrite(Lidgren.Network.NetBuffer msg, Barotrauma.Networking.Client c, object[] extraData = null)
         {
             msg.Write(autoPilot);
 
@@ -524,7 +524,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public override void ClientRead(Lidgren.Network.NetIncomingMessage msg, float sendingTime)
+        public void ClientRead(Lidgren.Network.NetIncomingMessage msg, float sendingTime)
         {
             AutoPilot = msg.ReadBoolean();
 

Subsurface/Source/Items/Components/Power/PowerContainer.cs

@@ -249,18 +249,18 @@ namespace Barotrauma.Items.Components
             GuiFrame.Update(1.0f / 60.0f);
         }
 
-        public override void ClientWrite(Lidgren.Network.NetBuffer msg, object[] extraData = null)
+        public void ClientWrite(Lidgren.Network.NetBuffer msg, object[] extraData = null)
         {
             float chargeSpeed = MathHelper.Clamp(rechargeSpeed / MaxRechargeSpeed, 0.0f, 1.0f);
             msg.WriteRangedSingle(chargeSpeed, 0.0f, 1.0f, 8);
         }
 
-        public override void ServerRead(Lidgren.Network.NetIncomingMessage msg, Barotrauma.Networking.Client c)
+        public void ServerRead(Lidgren.Network.NetIncomingMessage msg, Barotrauma.Networking.Client c)
         {
             RechargeSpeed = msg.ReadRangedSingle(0.0f, 1.0f, 8) * maxRechargeSpeed;
         }
 
-        public override void ServerWrite(Lidgren.Network.NetBuffer msg, Barotrauma.Networking.Client c, object[] extraData = null)
+        public void ServerWrite(Lidgren.Network.NetBuffer msg, Barotrauma.Networking.Client c, object[] extraData = null)
         {
             float chargeSpeed = MathHelper.Clamp(rechargeSpeed / MaxRechargeSpeed, 0.0f, 1.0f);
             msg.WriteRangedSingle(chargeSpeed, 0.0f, 1.0f, 8);
@@ -269,7 +269,7 @@ namespace Barotrauma.Items.Components
             msg.WriteRangedSingle(chargeRatio, 0.0f, 1.0f, 8);
         }
 
-        public override void ClientRead(Lidgren.Network.NetIncomingMessage msg, float sendingTime)
+        public void ClientRead(Lidgren.Network.NetIncomingMessage msg, float sendingTime)
         {
             RechargeSpeed = msg.ReadRangedSingle(0.0f, 1.0f, 8) * maxRechargeSpeed;
 

Subsurface/Source/Items/Components/Signal/Wire.cs

@@ -532,7 +532,7 @@ namespace Barotrauma.Items.Components
             base.RemoveComponentSpecific();
         }
 
-        public override void ClientWrite(Lidgren.Network.NetBuffer msg, object[] extraData = null)
+        public void ClientWrite(Lidgren.Network.NetBuffer msg, object[] extraData = null)
         {
             msg.Write((byte)Math.Min(Nodes.Count, 255));
             for (int i = 0; i < Math.Min(Nodes.Count, 255); i++)
@@ -542,7 +542,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public override void ServerRead(Lidgren.Network.NetIncomingMessage msg, Barotrauma.Networking.Client c)
+        public void ServerRead(Lidgren.Network.NetIncomingMessage msg, Barotrauma.Networking.Client c)
         {
             Nodes.Clear();