Unstable 0.17.1.0

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Signal/Terminal.cs

@@ -7,6 +7,16 @@ namespace Barotrauma.Items.Components
 {
     partial class Terminal : ItemComponent, IClientSerializable, IServerSerializable
     {
+        private readonly struct ClientEventData : IEventData
+        {
+            public readonly string Text;
+            
+            public ClientEventData(string text)
+            {
+                Text = text;
+            }
+        }
+        
         private GUIListBox historyBox;
         private GUITextBlock fillerBlock;
         private GUITextBox inputBox;
@@ -42,7 +52,7 @@ namespace Barotrauma.Items.Components
                     }
                     else
                     {
-                        item.CreateClientEvent(this, new object[] { text });
+                        item.CreateClientEvent(this, new ClientEventData(text));
                     }
                     textBox.Text = string.Empty;
                     return true;
@@ -133,17 +143,15 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public void ClientWrite(IWriteMessage msg, object[] extraData = null)
+        public void ClientEventWrite(IWriteMessage msg, NetEntityEvent.IData extraData = null)
         {
-            if (extraData is null) { return; }
-
-            if (extraData[2] is string str)
+            if (TryExtractEventData(extraData, out ClientEventData eventData))
             {
-                msg.Write(str);
+                msg.Write(eventData.Text);
             }
         }
 
-        public void ClientRead(ServerNetObject type, IReadMessage msg, float sendingTime)
+        public void ClientEventRead(IReadMessage msg, float sendingTime)
         {
             SendOutput(msg.ReadString());
         }