Moved MapEntity saving methods to the shared project (the server needs to be able to save subs in the campaign mode)

Barotrauma/BarotraumaShared/Source/Items/Components/ItemComponent.cs

@@ -574,6 +574,22 @@ namespace Barotrauma.Items.Components
 
             return ic;
         }
-        
+
+        public virtual XElement Save(XElement parentElement)
+        {
+            XElement componentElement = new XElement(name);
+
+            foreach (RelatedItem ri in requiredItems)
+            {
+                XElement newElement = new XElement("requireditem");
+                ri.Save(newElement);
+                componentElement.Add(newElement);
+            }
+
+            ObjectProperty.SaveProperties(this, componentElement);
+
+            parentElement.Add(componentElement);
+            return componentElement;
+        }
     }
 }

Barotrauma/BarotraumaShared/Source/Items/Components/ItemContainer.cs

@@ -10,10 +10,12 @@ namespace Barotrauma.Items.Components
     {
         public const int MaxInventoryCount = 4;
 
-        List<RelatedItem> containableItems;
+        private List<RelatedItem> containableItems;
         public ItemInventory Inventory;
 
         private List<Pair<Item, StatusEffect>> itemsWithStatusEffects;
+        
+        private ushort[] itemIds;
 
         //how many items can be contained
         [HasDefaultValue(5, false)]
@@ -240,6 +242,19 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        ushort[] itemIds;
+        public override XElement Save(XElement parentElement)
+        {
+            XElement componentElement = base.Save(parentElement);
+
+            string[] itemIdStrings = new string[Inventory.Items.Length];
+            for (int i = 0; i < Inventory.Items.Length; i++)
+            {
+                itemIdStrings[i] = (Inventory.Items[i] == null) ? "0" : Inventory.Items[i].ID.ToString();
+            }
+
+            componentElement.Add(new XAttribute("contained", string.Join(",", itemIdStrings)));
+
+            return componentElement;
+        }
     }
 }

Barotrauma/BarotraumaShared/Source/Items/Components/Signal/Connection.cs

@@ -1,4 +1,5 @@
 using Microsoft.Xna.Framework;
+using System;
 using System.Collections.Generic;
 using System.Xml.Linq;
 
@@ -205,5 +206,27 @@ namespace Barotrauma.Items.Components
             }
         }
 
+
+        public void Save(XElement parentElement)
+        {
+            XElement newElement = new XElement(IsOutput ? "output" : "input", new XAttribute("name", Name));
+
+            Array.Sort(Wires, delegate (Wire wire1, Wire wire2)
+            {
+                if (wire1 == null) return 1;
+                if (wire2 == null) return -1;
+                return wire1.Item.ID.CompareTo(wire2.Item.ID);
+            });
+
+            for (int i = 0; i < MaxLinked; i++)
+            {
+                if (Wires[i] == null) continue;
+                
+                newElement.Add(new XElement("link",
+                    new XAttribute("w", Wires[i].Item.ID.ToString())));
+            }
+
+            parentElement.Add(newElement);
+        }
     }
 }

Barotrauma/BarotraumaShared/Source/Items/Components/Signal/ConnectionPanel.cs

@@ -108,6 +108,18 @@ namespace Barotrauma.Items.Components
             }
         }
 
+        public override XElement Save(XElement parentElement)
+        {
+            XElement componentElement = base.Save(parentElement);
+
+            foreach (Connection c in Connections)
+            {
+                c.Save(componentElement);
+            }
+
+            return componentElement;
+        }
+
         protected override void RemoveComponentSpecific()
         {
             foreach (Connection c in Connections)
@@ -140,7 +152,7 @@ namespace Barotrauma.Items.Components
                 }
             }
         }
-
+        
         public void ServerRead(ClientNetObject type, NetBuffer msg, Client c)
         {
             List<Wire>[] wires = new List<Wire>[Connections.Count];

Barotrauma/BarotraumaShared/Source/Items/Components/Signal/Wire.cs

@@ -477,6 +477,24 @@ namespace Barotrauma.Items.Components
             Drawable = nodes.Any();
         }
 
+        public override XElement Save(XElement parentElement)
+        {
+            XElement componentElement = base.Save(parentElement);
+
+            if (nodes == null || nodes.Count == 0) return componentElement;
+
+            string[] nodeCoords = new string[nodes.Count * 2];
+            for (int i = 0; i < nodes.Count; i++)
+            {
+                nodeCoords[i * 2] = nodes[i].X.ToString(CultureInfo.InvariantCulture);
+                nodeCoords[i * 2 + 1] = nodes[i].Y.ToString(CultureInfo.InvariantCulture);
+            }
+
+            componentElement.Add(new XAttribute("nodes", string.Join(";", nodeCoords)));
+
+            return componentElement;
+        }
+
         protected override void ShallowRemoveComponentSpecific()
         {
             for (int i = 0; i < 2; i++)