Unstable 0.17.0.0

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Door.cs

@@ -19,7 +19,7 @@ namespace Barotrauma.Items.Components
         //openState when the vertices of the convex hull were last calculated
         private float lastConvexHullState;
 
-        [Serialize("1,1", false, description: "The scale of the shadow-casting area of the door (relative to the actual size of the door).")]
+        [Serialize("1,1", IsPropertySaveable.No, description: "The scale of the shadow-casting area of the door (relative to the actual size of the door).")]
         public Vector2 ShadowScale
         {
             get;

Barotrauma/BarotraumaClient/ClientSource/Items/Components/EntitySpawnerComponent.cs

@@ -17,12 +17,12 @@ namespace Barotrauma.Items.Components
                 case AreaShape.Rectangle:
                 {
                     RectangleF rect = GetAreaRectangle(SpawnAreaBounds, SpawnAreaOffset, draw: true);
-                    GUI.DrawRectangle(spriteBatch, rect.Location, rect.Size, GUI.Style.Red, isFilled: false, 0f, 4f);
+                    GUI.DrawRectangle(spriteBatch, rect.Location, rect.Size, GUIStyle.Red, isFilled: false, 0f, 4f);
 
                     if (MaximumAmountRangePadding > 0f)
                     {
                         rect.Inflate(MaximumAmountRangePadding, MaximumAmountRangePadding);
-                        GUI.DrawRectangle(spriteBatch, rect.Location, rect.Size, GUI.Style.Red, isFilled: false, 0f, 2f);
+                        GUI.DrawRectangle(spriteBatch, rect.Location, rect.Size, GUIStyle.Red, isFilled: false, 0f, 2f);
                     }
                     break;
                 }
@@ -30,11 +30,11 @@ namespace Barotrauma.Items.Components
                     Vector2 center = item.WorldPosition;
                     center += SpawnAreaOffset;
                     center.Y = -center.Y;
-                    spriteBatch.DrawCircle(center, SpawnAreaRadius, 32, GUI.Style.Red, thickness: 4f);
+                    spriteBatch.DrawCircle(center, SpawnAreaRadius, 32, GUIStyle.Red, thickness: 4f);
 
                     if (MaximumAmountRangePadding > 0f)
                     {
-                        spriteBatch.DrawCircle(center, SpawnAreaRadius + MaximumAmountRangePadding, 32, GUI.Style.Red, thickness: 2f);
+                        spriteBatch.DrawCircle(center, SpawnAreaRadius + MaximumAmountRangePadding, 32, GUIStyle.Red, thickness: 2f);
                     }
                     break;
             }
@@ -46,14 +46,14 @@ namespace Barotrauma.Items.Components
                 case AreaShape.Rectangle:
                 {
                     RectangleF rect = GetAreaRectangle(CrewAreaBounds, CrewAreaOffset, draw: true);
-                    GUI.DrawRectangle(spriteBatch, rect.Location, rect.Size, GUI.Style.Green, isFilled: false, 0f, 4f);
+                    GUI.DrawRectangle(spriteBatch, rect.Location, rect.Size, GUIStyle.Green, isFilled: false, 0f, 4f);
                     break;
                 }
                 case AreaShape.Circle:
                     Vector2 center = item.WorldPosition;
                     center += CrewAreaOffset;
                     center.Y = -center.Y;
-                    spriteBatch.DrawCircle(center, CrewAreaRadius, 32, GUI.Style.Green);
+                    spriteBatch.DrawCircle(center, CrewAreaRadius, 32, GUIStyle.Green);
                     break;
             }
         }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/GeneticMaterial.cs

@@ -6,17 +6,17 @@ namespace Barotrauma.Items.Components
 {
     partial class GeneticMaterial : ItemComponent
     {
-        [Serialize(0.0f, false)]
+        [Serialize(0.0f, IsPropertySaveable.No)]
         public float TooltipValueMin { get; set; }
 
-        [Serialize(0.0f, false)]
+        [Serialize(0.0f, IsPropertySaveable.No)]
         public float TooltipValueMax { get; set; }
 
-        public override void AddTooltipInfo(ref string name, ref string description)
+        public override void AddTooltipInfo(ref LocalizedString name, ref LocalizedString description)
         {
-            if (!string.IsNullOrEmpty(materialName) && item.ContainedItems.Count() > 0)
+            if (!materialName.IsNullOrEmpty() && item.ContainedItems.Count() > 0)
             {
-                string mergedMaterialName = materialName;
+                LocalizedString mergedMaterialName = materialName;
                 foreach (Item containedItem in item.ContainedItems)
                 {
                     var containedMaterial = containedItem.GetComponent<GeneticMaterial>();
@@ -31,30 +31,30 @@ namespace Barotrauma.Items.Components
                 name = TextManager.GetWithVariable("entityname.taintedgeneticmaterial", "[geneticmaterialname]", name);
             }
 
-            if (TextManager.ContainsTag("entitydescription." + Item.prefab.Identifier))
+            if (TextManager.ContainsTag("entitydescription." + Item.Prefab.Identifier))
             {
                 int value = (int)MathHelper.Lerp(TooltipValueMin, TooltipValueMax, item.ConditionPercentage / 100.0f);
-                description = TextManager.GetWithVariable("entitydescription." + Item.prefab.Identifier, "[value]", value.ToString());
+                description = TextManager.GetWithVariable("entitydescription." + Item.Prefab.Identifier, "[value]", value.ToString());
             }
             foreach (Item containedItem in item.ContainedItems)
             {
                 var containedGeneticMaterial = containedItem.GetComponent<GeneticMaterial>();
                 if (containedGeneticMaterial == null) { continue; }
-                string _ = string.Empty;
-                string containedDescription = containedItem.Description;
+                LocalizedString _ = string.Empty;
+                LocalizedString containedDescription = containedItem.Description;
                 containedGeneticMaterial.AddTooltipInfo(ref _, ref containedDescription);
-                if (!string.IsNullOrEmpty(containedDescription))
+                if (!containedDescription.IsNullOrEmpty())
                 {
                     description += '\n' + containedDescription;
                 }
             }
         }
 
-        public void ModifyDeconstructInfo(Deconstructor deconstructor, ref string buttonText, ref string infoText)
+        public void ModifyDeconstructInfo(Deconstructor deconstructor, ref LocalizedString buttonText, ref LocalizedString infoText)
         {
             if (deconstructor.InputContainer.Inventory.AllItems.Count() == 2)
             {
-                if (!deconstructor.InputContainer.Inventory.AllItems.All(it => it.prefab == item.prefab))
+                if (!deconstructor.InputContainer.Inventory.AllItems.All(it => it.Prefab == item.Prefab))
                 {
                     buttonText = TextManager.Get("researchstation.combine");
                     infoText = TextManager.Get("researchstation.combine.infotext");
@@ -74,12 +74,12 @@ namespace Barotrauma.Items.Components
             if (Tainted)
             {
                 uint selectedTaintedEffectId = msg.ReadUInt32();
-                selectedTaintedEffect = AfflictionPrefab.Prefabs.Find(a => a.UIntIdentifier == selectedTaintedEffectId);
+                selectedTaintedEffect = AfflictionPrefab.Prefabs.Find(a => a.UintIdentifier == selectedTaintedEffectId);
             }
             else
             {
                 uint selectedEffectId = msg.ReadUInt32();
-                selectedEffect = AfflictionPrefab.Prefabs.Find(a => a.UIntIdentifier == selectedEffectId);
+                selectedEffect = AfflictionPrefab.Prefabs.Find(a => a.UintIdentifier == selectedEffectId);
             }
         }
     }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Growable.cs

@@ -1,6 +1,7 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Xml.Linq;
 using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
@@ -10,15 +11,15 @@ namespace Barotrauma.Items.Components
 {
     internal class VineSprite
     {
-        [Serialize("0,0,0,0", false)]
+        [Serialize("0,0,0,0", IsPropertySaveable.No)]
         public Rectangle SourceRect { get; private set; }
 
-        [Serialize("0.5,0.5", false)]
+        [Serialize("0.5,0.5", IsPropertySaveable.No)]
         public Vector2 Origin { get; private set; }
 
         public Vector2 AbsoluteOrigin;
 
-        public VineSprite(XElement element)
+        public VineSprite(ContentXElement element)
         {
             SerializableProperty.DeserializeProperties(this, element);
             AbsoluteOrigin = new Vector2(SourceRect.Width * Origin.X, SourceRect.Height * Origin.Y);
@@ -109,28 +110,27 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        partial void LoadVines(XElement element)
+        partial void LoadVines(ContentXElement element)
         {
-            string? vineAtlasPath = element.GetAttributeString("vineatlas", null);
-            string? decayAtlasPath = element.GetAttributeString("decayatlas", null);
+            ContentPath vineAtlasPath = element.GetAttributeContentPath("vineatlas") ?? ContentPath.Empty;
+            ContentPath decayAtlasPath = element.GetAttributeContentPath("decayatlas") ?? ContentPath.Empty;
 
-            if (vineAtlasPath != null)
+            if (!vineAtlasPath.IsNullOrEmpty())
             {
-                VineAtlas = new Sprite(vineAtlasPath, Rectangle.Empty);
+                VineAtlas = new Sprite(vineAtlasPath.Value, Rectangle.Empty);
             }
 
-            if (decayAtlasPath != null)
+            if (!decayAtlasPath.IsNullOrEmpty())
             {
-                DecayAtlas = new Sprite(decayAtlasPath, Rectangle.Empty);
+                DecayAtlas = new Sprite(decayAtlasPath.Value, Rectangle.Empty);
             }
 
-            foreach (XElement subElement in element.Elements())
+            foreach (var subElement in element.Elements())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
                 {
                     case "vinesprite":
-                        var tileType = subElement.GetAttributeString("type", null);
-                        VineTileType type = Enum.Parse<VineTileType>(tileType);
+                        VineTileType type = subElement.GetAttributeEnum("type", VineTileType.Stem);
                         VineSprites.Add(type, new VineSprite(subElement));
                         break;
                     case "flowersprite":
@@ -145,11 +145,11 @@ namespace Barotrauma.Items.Components
                 leafVariants = LeafSprites.Count;
             }
 
-            foreach (VineTileType type in Enum.GetValues(typeof(VineTileType)))
+            foreach (VineTileType type in Enum.GetValues(typeof(VineTileType)).Cast<VineTileType>())
             {
                 if (!VineSprites.ContainsKey(type))
                 {
-                    DebugConsole.ThrowError($"Vine sprite missing from {item.prefab.Identifier}: {type}");
+                    DebugConsole.ThrowError($"Vine sprite missing from {item.Prefab.Identifier}: {type}");
                 }
             }
         }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Holdable/Holdable.cs

@@ -55,7 +55,7 @@ namespace Barotrauma.Items.Components
                 item.SpriteColor * 0.5f,
                 0.0f, item.Scale, SpriteEffects.None, 0.0f);
 
-            GUI.DrawRectangle(spriteBatch, new Vector2(attachPos.X - 2, -attachPos.Y - 2), Vector2.One * 5, GUI.Style.Red, thickness: 3);
+            GUI.DrawRectangle(spriteBatch, new Vector2(attachPos.X - 2, -attachPos.Y - 2), Vector2.One * 5, GUIStyle.Red, thickness: 3);
         }
 
         public void ClientWrite(IWriteMessage msg, object[] extraData = null)

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Holdable/IdCard.cs

@@ -21,107 +21,44 @@ namespace Barotrauma.Items.Components
             public Color FacialHairColor;
             public Color SkinColor;
 
-            public void ExtractJobPrefab(string[] tags)
+            public void ExtractJobPrefab(IReadOnlyDictionary<Identifier, string> tags)
             {
-                string jobIdTag = tags.FirstOrDefault(s => s.StartsWith("jobid:"));
-
-                if (jobIdTag != null && jobIdTag.Length > 6)
+                if (!tags.TryGetValue("jobid".ToIdentifier(), out string jobId)) { return; }
+                
+                if (!jobId.IsNullOrEmpty())
                 {
-                    string jobId = jobIdTag.Substring(6);
-                    if (jobId != string.Empty)
-                    {
-                        JobPrefab = JobPrefab.Get(jobId);
-                    }
+                    JobPrefab = JobPrefab.Get(jobId);
                 }
             }
 
-            public void ExtractAppearance(CharacterInfo characterInfo, string[] tags)
+            public void ExtractAppearance(CharacterInfo characterInfo, IdCard idCard)
             {
-                Gender disguisedGender = Gender.None;
-                Race disguisedRace = Race.None;
-                int disguisedHeadSpriteId = -1;
-                int disguisedHairIndex = -1;
-                int disguisedBeardIndex = -1;
-                int disguisedMoustacheIndex = -1;
-                int disguisedFaceAttachmentIndex = -1;
-                Color hairColor = Color.Black;
-                Color facialHairColor = Color.Black;
-                Color skinColor = Color.Black;
+                int disguisedHairIndex = idCard.OwnerHairIndex;
+                int disguisedBeardIndex = idCard.OwnerBeardIndex;
+                int disguisedMoustacheIndex = idCard.OwnerMoustacheIndex;
+                int disguisedFaceAttachmentIndex = idCard.OwnerFaceAttachmentIndex;
+                Color hairColor = idCard.OwnerHairColor;
+                Color facialHairColor = idCard.OwnerFacialHairColor;
+                Color skinColor = idCard.OwnerSkinColor;
+                var tags = idCard.OwnerTagSet;
 
-                foreach (string tag in tags)
-                {
-                    string[] s = tag.Split(':');
-
-                    switch (s[0].ToLowerInvariant())
-                    {
-                        case "haircolor":
-                            hairColor = XMLExtensions.ParseColor(s[1]);
-                            break;
-                        
-                        case "facialhaircolor":
-                            facialHairColor = XMLExtensions.ParseColor(s[1]);
-                            break;
-                        
-                        case "skincolor":
-                            skinColor = XMLExtensions.ParseColor(s[1]);
-                            break;
-                            
-                        case "gender":
-                            Enum.TryParse(s[1], ignoreCase: true, out disguisedGender);
-                            break;
-
-                        case "race":
-                            Enum.TryParse(s[1], ignoreCase: true, out disguisedRace);
-                            break;
-
-                        case "headspriteid":
-                            int.TryParse(s[1], NumberStyles.Any, CultureInfo.InvariantCulture, out disguisedHeadSpriteId);
-                            break;
-
-                        case "hairindex":
-                            disguisedHairIndex = int.Parse(s[1]);
-                            break;
-
-                        case "beardindex":
-                            disguisedBeardIndex = int.Parse(s[1]);
-                            break;
-
-                        case "moustacheindex":
-                            disguisedMoustacheIndex = int.Parse(s[1]);
-                            break;
-
-                        case "faceattachmentindex":
-                            disguisedFaceAttachmentIndex = int.Parse(s[1]);
-                            break;
-
-                        case "sheetindex":
-                            string[] vectorValues = s[1].Split(";");
-                            SheetIndex = new Vector2(float.Parse(vectorValues[0]), float.Parse(vectorValues[1]));
-                            break;
-                    }
-                }
-
-                if ((characterInfo.HasGenders && disguisedGender == Gender.None)
-                    || (characterInfo.HasRaces && disguisedRace == Race.None)
-                    || disguisedHeadSpriteId <= 0)
+                if ((characterInfo.HasSpecifierTags && !tags.Any()))
                 {
                     Portrait = null;
                     Attachments = null;
                     return;
                 }
 
-                foreach (XElement limbElement in characterInfo.Ragdoll.MainElement.Elements())
+                foreach (ContentXElement limbElement in characterInfo.Ragdoll.MainElement.Elements())
                 {
                     if (!limbElement.GetAttributeString("type", "").Equals("head", StringComparison.OrdinalIgnoreCase)) { continue; }
 
-                    XElement spriteElement = limbElement.Element("sprite");
+                    ContentXElement spriteElement = limbElement.GetChildElement("sprite");
                     if (spriteElement == null) { continue; }
 
                     string spritePath = spriteElement.Attribute("texture").Value;
 
-                    spritePath = spritePath.Replace("[GENDER]", disguisedGender.ToString().ToLowerInvariant());
-                    spritePath = spritePath.Replace("[RACE]", disguisedRace.ToString().ToLowerInvariant());
-                    spritePath = spritePath.Replace("[HEADID]", disguisedHeadSpriteId.ToString());
+                    spritePath = characterInfo.ReplaceVars(spritePath);
 
                     string fileName = Path.GetFileNameWithoutExtension(spritePath);
 
@@ -144,13 +81,11 @@ namespace Barotrauma.Items.Components
 
                 if (characterInfo.Wearables != null)
                 {
-                    float baldnessChance = disguisedGender == Gender.Female ? 0.05f : 0.2f;
+                    float baldnessChance = 0.1f;
 
-                    List<XElement> createElementList(WearableType wearableType, float emptyCommonness = 1.0f)
+                    List<ContentXElement> createElementList(WearableType wearableType, float emptyCommonness = 1.0f)
                         => CharacterInfo.AddEmpty(
-                            characterInfo.FilterByTypeAndHeadID(
-                                characterInfo.FilterElementsByGenderAndRace(characterInfo.Wearables, disguisedGender, disguisedRace),
-                                wearableType, disguisedHeadSpriteId),
+                            characterInfo.FilterElements(characterInfo.Wearables, tags, wearableType),
                             wearableType, emptyCommonness);
 
                     var disguisedHairs = createElementList(WearableType.Hair, baldnessChance);
@@ -158,7 +93,7 @@ namespace Barotrauma.Items.Components
                     var disguisedMoustaches = createElementList(WearableType.Moustache);
                     var disguisedFaceAttachments = createElementList(WearableType.FaceAttachment);
 
-                    XElement getElementFromList(List<XElement> list, int index)
+                    ContentXElement getElementFromList(List<ContentXElement> list, int index)
                         => CharacterInfo.IsValidIndex(index, list)
                             ? list[index]
                             : characterInfo.GetRandomElement(list);
@@ -170,9 +105,9 @@ namespace Barotrauma.Items.Components
                     
                     Attachments = new List<WearableSprite>();
 
-                    void loadAttachments(List<WearableSprite> attachments, XElement element, WearableType wearableType)
+                    void loadAttachments(List<WearableSprite> attachments, ContentXElement element, WearableType wearableType)
                     {
-                        foreach (var s in element?.Elements("sprite") ?? Enumerable.Empty<XElement>())
+                        foreach (var s in element?.GetChildElements("sprite") ?? Enumerable.Empty<ContentXElement>())
                         {
                             attachments.Add(new WearableSprite(s, wearableType));
                         }
@@ -185,7 +120,7 @@ namespace Barotrauma.Items.Components
 
                     loadAttachments(Attachments,
                         characterInfo.OmitJobInPortraitClothing
-                            ? JobPrefab.NoJobElement?.Element("PortraitClothing")
+                            ? JobPrefab.NoJobElement?.GetChildElement("PortraitClothing")
                             : JobPrefab?.ClothingElement,
                         WearableType.JobIndicator);
                 }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Holdable/RangedWeapon.cs

@@ -26,29 +26,28 @@ namespace Barotrauma.Items.Components
         private readonly List<ParticleEmitter> particleEmitters = new List<ParticleEmitter>();
         private readonly List<ParticleEmitter> particleEmitterCharges = new List<ParticleEmitter>();
 
-        [Serialize(1.0f, false, description: "The scale of the crosshair sprite (if there is one).")]
+        [Serialize(1.0f, IsPropertySaveable.No, description: "The scale of the crosshair sprite (if there is one).")]
         public float CrossHairScale
         {
             get;
             private set;
         }
 
-        partial void InitProjSpecific(XElement element)
+        partial void InitProjSpecific(ContentXElement element)
         {
-            foreach (XElement subElement in element.Elements())
+            foreach (var subElement in element.Elements())
             {
+                string textureDir = GetTextureDirectory(subElement);
                 switch (subElement.Name.ToString().ToLowerInvariant())
                 {
                     case "crosshair":
                         {
-                            string texturePath = subElement.GetAttributeString("texture", "");
-                            crosshairSprite = new Sprite(subElement, texturePath.Contains("/") ? "" : Path.GetDirectoryName(item.Prefab.FilePath));
+                            crosshairSprite = new Sprite(subElement, path: textureDir);
                         }
                         break;
                     case "crosshairpointer":
                         {
-                            string texturePath = subElement.GetAttributeString("texture", "");
-                            crosshairPointerSprite = new Sprite(subElement, texturePath.Contains("/") ? "" : Path.GetDirectoryName(item.Prefab.FilePath));
+                            crosshairPointerSprite = new Sprite(subElement, path: textureDir);
                         }
                         break;
                     case "particleemitter":
@@ -58,7 +57,7 @@ namespace Barotrauma.Items.Components
                         particleEmitterCharges.Add(new ParticleEmitter(subElement));
                         break;
                     case "chargesound":
-                        chargeSound = Submarine.LoadRoundSound(subElement, false);
+                        chargeSound = RoundSound.Load(subElement, false);
                         break;
                 }
             }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Holdable/Sprayer.cs

@@ -30,11 +30,11 @@ namespace Barotrauma.Items.Components
 
         private Color color;
 
-        partial void InitProjSpecific(XElement element)
+        partial void InitProjSpecific(ContentXElement element)
         {
             currentCrossHairPointerScale = element.GetAttributeFloat("crosshairscale", 0.1f);
 
-            foreach (XElement subElement in element.Elements())
+            foreach (var subElement in element.Elements())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
                 {
@@ -243,7 +243,7 @@ namespace Barotrauma.Items.Components
             if (liquidItem == null) { return; }
 
             bool isCleaning = false;
-            liquidColors.TryGetValue(liquidItem.prefab.Identifier, out color);
+            liquidColors.TryGetValue(liquidItem.Prefab.Identifier, out color);
 
             // Ethanol or other cleaning solvent
             if (color.A == 0) { isCleaning = true; }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/ItemComponent.cs

@@ -24,7 +24,7 @@ namespace Barotrauma.Items.Components
         public readonly RoundSound RoundSound;
         public readonly ActionType Type;
 
-        public string VolumeProperty;
+        public Identifier VolumeProperty;
 
         public float VolumeMultiplier
         {
@@ -145,7 +145,7 @@ namespace Barotrauma.Items.Components
 
         public GUIFrame GuiFrame { get; set; }
 
-        [Serialize(false, false)]
+        [Serialize(false, IsPropertySaveable.No)]
         public bool AllowUIOverlap
         {
             get;
@@ -153,21 +153,21 @@ namespace Barotrauma.Items.Components
         }
 
         private ItemComponent linkToUIComponent;
-        [Serialize("", false)]
+        [Serialize("", IsPropertySaveable.No)]
         public string LinkUIToComponent
         {
             get;
             set;
         }
 
-        [Serialize(0, false)]
+        [Serialize(0, IsPropertySaveable.No)]
         public int HudPriority
         {
             get;
             private set;
         }
 
-        [Serialize(0, false)]
+        [Serialize(0, IsPropertySaveable.No)]
         public int HudLayer
         {
             get;
@@ -457,14 +457,14 @@ namespace Barotrauma.Items.Components
         {
         }
 
-        private bool LoadElemProjSpecific(XElement subElement)
+        private bool LoadElemProjSpecific(ContentXElement subElement)
         {
             switch (subElement.Name.ToString().ToLowerInvariant())
             {
                 case "guiframe":
                     if (subElement.Attribute("rect") != null)
                     {
-                        DebugConsole.ThrowError("Error in item config \"" + item.ConfigFile + "\" - GUIFrame defined as rect, use RectTransform instead.");
+                        DebugConsole.ThrowError($"Error in item config \"{item.ConfigFilePath}\" - GUIFrame defined as rect, use RectTransform instead.");
                         break;
                     }
                     GuiFrameSource = subElement;
@@ -475,21 +475,18 @@ namespace Barotrauma.Items.Components
                     break;
                 case "itemsound":
                 case "sound":
-                    string filePath = subElement.GetAttributeString("file", "");
+                    //TODO: this validation stuff should probably go somewhere else
+                    string filePath = subElement.GetAttributeStringUnrestricted("file", "");
 
-                    if (filePath == "") filePath = subElement.GetAttributeString("sound", "");
+                    if (filePath.IsNullOrEmpty()) { filePath = subElement.GetAttributeStringUnrestricted("sound", ""); }
 
-                    if (filePath == "")
+                    if (filePath.IsNullOrEmpty())
                     {
-                        DebugConsole.ThrowError("Error when instantiating item \"" + item.Name + "\" - sound with no file path set");
+                        DebugConsole.ThrowError(
+                            $"Error when instantiating item \"{item.Name}\" - sound with no file path set");
                         break;
                     }
 
-                    if (!filePath.Contains("/") && !filePath.Contains("\\") && !filePath.Contains(Path.DirectorySeparatorChar))
-                    {
-                        filePath = Path.Combine(Path.GetDirectoryName(item.Prefab.FilePath), filePath);
-                    }
-
                     ActionType type;
                     try
                     {
@@ -501,11 +498,11 @@ namespace Barotrauma.Items.Components
                         break;
                     }
                     
-                    RoundSound sound = Submarine.LoadRoundSound(subElement);
+                    RoundSound sound = RoundSound.Load(subElement);
                     if (sound == null) { break; }
                     ItemSound itemSound = new ItemSound(sound, type, subElement.GetAttributeBool("loop", false))
                     {
-                        VolumeProperty = subElement.GetAttributeString("volumeproperty", "").ToLowerInvariant()
+                        VolumeProperty = subElement.GetAttributeIdentifier("volumeproperty", "")
                     };
 
                     if (soundSelectionModes == null) soundSelectionModes = new Dictionary<ActionType, SoundSelectionMode>();
@@ -621,6 +618,7 @@ namespace Barotrauma.Items.Components
             }
             OnResolutionChanged();
         }
-        public virtual void AddTooltipInfo(ref string name, ref string description) { }
+
+        public virtual void AddTooltipInfo(ref LocalizedString name, ref LocalizedString description) { }
     }
 }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/ItemContainer.cs

@@ -49,25 +49,25 @@ namespace Barotrauma.Items.Components
         /// <summary>
         /// Depth at which the contained sprites are drawn. If not set, the original depth of the item sprites is used.
         /// </summary>
-        [Serialize(-1.0f, false, description: "Depth at which the contained sprites are drawn. If not set, the original depth of the item sprites is used.")]
+        [Serialize(-1.0f, IsPropertySaveable.No, description: "Depth at which the contained sprites are drawn. If not set, the original depth of the item sprites is used.")]
         public float ContainedSpriteDepth { get; set; }
 
-        [Serialize(null, false, description: "An optional text displayed above the item's inventory.")]
+        [Serialize(null, IsPropertySaveable.No, description: "An optional text displayed above the item's inventory.")]
         public string UILabel { get; set; }
 
         public GUIComponentStyle IndicatorStyle { get; set; }
 
-        [Serialize(null, false)]
+        [Serialize(null, IsPropertySaveable.No)]
         public string ContainedStateIndicatorStyle { get; set; }
 
-        [Serialize(-1, false, description: "Can be used to make the contained state indicator display the condition of the item in a specific slot even when the container's capacity is more than 1.")]
+        [Serialize(-1, IsPropertySaveable.No, description: "Can be used to make the contained state indicator display the condition of the item in a specific slot even when the container's capacity is more than 1.")]
         public int ContainedStateIndicatorSlot { get; set; }
 
-        [Serialize(true, false, description: "Should an indicator displaying the state of the contained items be displayed on this item's inventory slot. "+
-            "If this item can only contain one item, the indicator will display the condition of the contained item, otherwise it will indicate how full the item is.")]
+        [Serialize(true, IsPropertySaveable.No, description: "Should an indicator displaying the state of the contained items be displayed on this item's inventory slot. "+
+                                                             "If this item can only contain one item, the indicator will display the condition of the contained item, otherwise it will indicate how full the item is.")]
         public bool ShowContainedStateIndicator { get; set; }
 
-        [Serialize(false, false, description: "If enabled, the condition of this item is displayed in the indicator that would normally show the state of the contained items." +
+        [Serialize(false, IsPropertySaveable.No, description: "If enabled, the condition of this item is displayed in the indicator that would normally show the state of the contained items." +
             " May be useful for items such as ammo boxes and magazines that spawn projectiles as needed," +
             " and use the condition to determine how many projectiles can be spawned in total.")]
         public bool ShowConditionInContainedStateIndicator
@@ -76,13 +76,13 @@ namespace Barotrauma.Items.Components
             set;
         }
 
-        [Serialize(false, false, description: "If true, the contained state indicator calculates how full the item is based on the total amount of items that can be stacked inside it, as opposed to how many of the inventory slots are occupied.")]
+        [Serialize(false, IsPropertySaveable.No, description: "If true, the contained state indicator calculates how full the item is based on the total amount of items that can be stacked inside it, as opposed to how many of the inventory slots are occupied.")]
         public bool ShowTotalStackCapacityInContainedStateIndicator { get; set; }
 
-        [Serialize(false, false, description: "Should the inventory of this item be kept open when the item is equipped by a character.")]
+        [Serialize(false, IsPropertySaveable.No, description: "Should the inventory of this item be kept open when the item is equipped by a character.")]
         public bool KeepOpenWhenEquipped { get; set; }
 
-        [Serialize(false, false, description: "Can the inventory of this item be moved around on the screen by the player.")]
+        [Serialize(false, IsPropertySaveable.No, description: "Can the inventory of this item be moved around on the screen by the player.")]
         public bool MovableFrame { get; set; }
 
         public Vector2 DrawSize
@@ -91,10 +91,10 @@ namespace Barotrauma.Items.Components
             get { return Vector2.Zero; }
         }
 
-        partial void InitProjSpecific(XElement element)
+        partial void InitProjSpecific(ContentXElement element)
         {
             slotIcons = new Sprite[capacity];
-            foreach (XElement subElement in element.Elements())
+            foreach (var subElement in element.Elements())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
                 {
@@ -132,12 +132,12 @@ namespace Barotrauma.Items.Components
                 //if neither a style or a custom sprite is defined, use default style
                 if (ContainedStateIndicator == null)
                 {
-                    IndicatorStyle = GUI.Style.GetComponentStyle("ContainedStateIndicator.Default");
+                    IndicatorStyle = GUIStyle.GetComponentStyle("ContainedStateIndicator.Default");
                 }
             }
             else
             {
-                IndicatorStyle = GUI.Style.GetComponentStyle("ContainedStateIndicator." + ContainedStateIndicatorStyle);
+                IndicatorStyle = GUIStyle.GetComponentStyle("ContainedStateIndicator." + ContainedStateIndicatorStyle);
                 if (ContainedStateIndicator != null || ContainedStateIndicatorEmpty != null)
                 {
                     DebugConsole.AddWarning($"Item \"{item.Name}\" defines both a contained state indicator style and a custom indicator sprite. Will use the custom sprite...");
@@ -165,7 +165,7 @@ namespace Barotrauma.Items.Components
                 CreateGUI();
             }
 
-            containedSpriteDepths = element.GetAttributeFloatArray("containedspritedepths", new float[0]);
+            containedSpriteDepths = element.GetAttributeFloatArray("containedspritedepths", Array.Empty<float>());
         }
 
         protected override void CreateGUI()
@@ -176,12 +176,12 @@ namespace Barotrauma.Items.Components
                 CanBeFocused = false
             };
 
-            string labelText = GetUILabel();
+            LocalizedString labelText = GetUILabel();
             GUITextBlock label = null;
-            if (!string.IsNullOrEmpty(labelText))
+            if (!labelText.IsNullOrEmpty())
             {
                 label = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), content.RectTransform, Anchor.TopCenter), 
-                    labelText, font: GUI.SubHeadingFont, textAlignment: Alignment.Center, wrap: true);
+                    labelText, font: GUIStyle.SubHeadingFont, textAlignment: Alignment.Center, wrap: true);
             }
 
             float minInventoryAreaSize = 0.5f;
@@ -212,12 +212,12 @@ namespace Barotrauma.Items.Components
             Inventory.RectTransform = guiCustomComponent.RectTransform;
         }
 
-        public string GetUILabel()
+        public LocalizedString GetUILabel()
         {
             if (UILabel == string.Empty) { return string.Empty; }
             if (UILabel != null)
             {
-                return TextManager.Get("UILabel." + UILabel, returnNull: true) ?? TextManager.Get(UILabel);
+                return TextManager.Get("UILabel." + UILabel).Fallback(TextManager.Get(UILabel));
             }
             else
             {

Barotrauma/BarotraumaClient/ClientSource/Items/Components/ItemLabel.cs

@@ -27,7 +27,7 @@ namespace Barotrauma.Items.Components
 
         private Vector4 padding;
 
-        [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 { return padding; }
@@ -39,7 +39,7 @@ namespace Barotrauma.Items.Components
         }
 
         private string text;
-        [Serialize("", true, translationTextTag: "Label.", description: "The text displayed in the label.", alwaysUseInstanceValues: true), Editable(100)]
+        [Serialize("", IsPropertySaveable.Yes, translationTextTag: "Label.", description: "The text displayed in the label.", alwaysUseInstanceValues: true), Editable(100)]
         public string Text
         {
             get { return text; }
@@ -60,7 +60,7 @@ namespace Barotrauma.Items.Components
 
         private bool ignoreLocalization;
 
-        [Editable, Serialize(false, true, "Whether or not to skip localization and always display the raw value.")]
+        [Editable, Serialize(false, IsPropertySaveable.Yes, "Whether or not to skip localization and always display the raw value.")]
         public bool IgnoreLocalization
         {
             get => ignoreLocalization;
@@ -71,13 +71,13 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public string DisplayText
+        public LocalizedString DisplayText
         {
             get;
             private set;
         }
 
-        [Editable, Serialize("0,0,0,255", true, description: "The color of the text displayed on the label (R,G,B,A).", alwaysUseInstanceValues: true)]
+        [Editable, Serialize("0,0,0,255", IsPropertySaveable.Yes, description: "The color of the text displayed on the label (R,G,B,A).", alwaysUseInstanceValues: true)]
         public Color TextColor
         {
             get { return textColor; }
@@ -88,7 +88,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        [Editable(0.0f, 10.0f), Serialize(1.0f, true, description: "The scale of the text displayed on the label.", alwaysUseInstanceValues: true)]
+        [Editable(0.0f, 10.0f), Serialize(1.0f, IsPropertySaveable.Yes, description: "The scale of the text displayed on the label.", alwaysUseInstanceValues: true)]
         public float TextScale
         {
             get { return textBlock == null ? 1.0f : textBlock.TextScale; }
@@ -99,7 +99,7 @@ namespace Barotrauma.Items.Components
         }
 
         private bool scrollable;
-        [Serialize(false, true, description: "Should the text scroll horizontally across the item if it's too long to be displayed all at once.")]
+        [Serialize(false, IsPropertySaveable.Yes, description: "Should the text scroll horizontally across the item if it's too long to be displayed all at once.")]
         public bool Scrollable
         {
             get { return scrollable; }
@@ -112,7 +112,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        [Serialize(20.0f, true, description: "How fast the text scrolls across the item (only valid if Scrollable is set to true).")]
+        [Serialize(20.0f, IsPropertySaveable.Yes, description: "How fast the text scrolls across the item (only valid if Scrollable is set to true).")]
         public float ScrollSpeed
         {
             get;
@@ -131,7 +131,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public ItemLabel(Item item, XElement element)
+        public ItemLabel(Item item, ContentXElement element)
             : base(item, element)
         {            
         }
@@ -148,13 +148,13 @@ namespace Barotrauma.Items.Components
                 //(so the text can scroll entirely out of view before we reset it back to start)
                 needsScrolling = true;
                 float spaceWidth = textBlock.Font.MeasureChar(' ').X;
-                scrollingText = new string(' ', (int)Math.Ceiling(textAreaWidth / spaceWidth)) + DisplayText;
+                scrollingText = new string(' ', (int)Math.Ceiling(textAreaWidth / spaceWidth)) + DisplayText.Value;
             }
             else
             {
                 //whole text can fit in the textblock, no need to scroll
                 needsScrolling = false;
-                scrollingText = DisplayText;
+                scrollingText = DisplayText.Value;
                 scrollPadding = 0;
                 scrollAmount = 0.0f;
                 scrollIndex = 0;
@@ -176,7 +176,7 @@ namespace Barotrauma.Items.Components
 
         private void SetDisplayText(string value)
         {
-            DisplayText = IgnoreLocalization ? value : TextManager.Get(value, returnNull: true) ?? value;
+            DisplayText = IgnoreLocalization ? value : TextManager.Get(value).Fallback(value);
             TextBlock.Text = DisplayText;
             if (Screen.Selected == GameMain.SubEditorScreen && Scrollable)
             {
@@ -189,7 +189,7 @@ namespace Barotrauma.Items.Components
         private void RecreateTextBlock()
         {
             textBlock = new GUITextBlock(new RectTransform(item.Rect.Size), "",
-                textColor: textColor, font: GUI.UnscaledSmallFont, textAlignment: scrollable ? Alignment.CenterLeft : Alignment.Center, wrap: !scrollable, style: null)
+                textColor: textColor, font: GUIStyle.UnscaledSmallFont, textAlignment: scrollable ? Alignment.CenterLeft : Alignment.Center, wrap: !scrollable, style: null)
             {
                 TextDepth = item.SpriteDepth - 0.00001f,
                 RoundToNearestPixel = false,
@@ -261,6 +261,7 @@ namespace Barotrauma.Items.Components
         
         public void Draw(SpriteBatch spriteBatch, bool editing = false, float itemDepth = -1)
         {
+            if (item.ParentInventory != null) { return; }
             if (editing)
             {
                 if (!MathUtils.NearlyEqual(prevScale, item.Scale) || prevRect != item.Rect)

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Ladder.cs

@@ -30,7 +30,7 @@ namespace Barotrauma.Items.Components
                 depth: BackgroundSpriteDepth);
         }
 
-        partial void InitProjSpecific(XElement element)
+        partial void InitProjSpecific(ContentXElement element)
         {
             var backgroundSpriteElement = element.GetChildElement("backgroundsprite");
             if (backgroundSpriteElement != null)

Barotrauma/BarotraumaClient/ClientSource/Items/Components/LightComponent.cs

@@ -44,17 +44,22 @@ namespace Barotrauma.Items.Components
         {
             if (ParentBody != null)
             {
-                Light.Position = ParentBody.Position;
+                Light.ParentBody = ParentBody;
             }
             else if (turret != null)
             {
                 Light.Position = new Vector2(item.Rect.X + turret.TransformedBarrelPos.X, item.Rect.Y - turret.TransformedBarrelPos.Y);
             }
+            else if (item.body != null)
+            {
+                Light.ParentBody = item.body;
+            }
             else
             {
-                Light.Position = item.Position;
+                Light.Position = item.DrawPosition;
+                if (item.Submarine != null) { Light.Position -= item.Submarine.DrawPosition; }
             }
-            PhysicsBody body = ParentBody ?? item.body;
+            PhysicsBody body = Light.ParentBody;
             if (body != null)
             {
                 Light.Rotation = body.Dir > 0.0f ? body.DrawRotation : body.DrawRotation - MathHelper.Pi;
@@ -74,7 +79,9 @@ namespace Barotrauma.Items.Components
                 Vector2 origin = Light.LightSprite.Origin;
                 if ((Light.LightSpriteEffect & SpriteEffects.FlipHorizontally) == SpriteEffects.FlipHorizontally) { origin.X = Light.LightSprite.SourceRect.Width - origin.X; }
                 if ((Light.LightSpriteEffect & SpriteEffects.FlipVertically) == SpriteEffects.FlipVertically) { origin.Y = Light.LightSprite.SourceRect.Height - origin.Y; }
-                Light.LightSprite.Draw(spriteBatch, new Vector2(item.DrawPosition.X, -item.DrawPosition.Y), lightColor * lightBrightness, origin, -Light.Rotation, item.Scale, Light.LightSpriteEffect, itemDepth - 0.0001f);
+
+                Vector2 drawPos = item.body?.DrawPosition ?? item.DrawPosition;
+                Light.LightSprite.Draw(spriteBatch, new Vector2(drawPos.X, -drawPos.Y), lightColor * lightBrightness, origin, -Light.Rotation, item.Scale, Light.LightSpriteEffect, itemDepth - 0.0001f);
             }
         }
 

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Deconstructor.cs

@@ -21,13 +21,13 @@ namespace Barotrauma.Items.Components
 
         private GUITextBlock infoArea;
 
-        [Serialize("DeconstructorDeconstruct", true)]
+        [Serialize("DeconstructorDeconstruct", IsPropertySaveable.Yes)]
         public string ActivateButtonText { get; set; }
-
-        [Serialize("", true)]
+        
+        [Serialize("", IsPropertySaveable.Yes)]
         public string InfoText { get; set; }
 
-        [Serialize(0.0f, true)]
+        [Serialize(0.0f, IsPropertySaveable.Yes)]
         public float InfoAreaWidth { get; set; }
 
         partial void InitProjSpecific(XElement element)
@@ -49,7 +49,7 @@ namespace Barotrauma.Items.Components
                 RelativeSpacing = 0.08f
             };
 
-            new GUITextBlock(new RectTransform(new Vector2(1f, 0.07f), paddedFrame.RectTransform), item.Name, font: GUI.SubHeadingFont)
+            new GUITextBlock(new RectTransform(new Vector2(1f, 0.07f), paddedFrame.RectTransform), item.Name, font: GUIStyle.SubHeadingFont)
             {
                 TextAlignment = Alignment.Center,
                 AutoScaleHorizontal = true
@@ -63,7 +63,7 @@ namespace Barotrauma.Items.Components
                     Stretch = true, 
                     RelativeSpacing = 0.05f
                 };
-                    var inputLabel = new GUITextBlock(new RectTransform(Vector2.One, inputLabelArea.RectTransform), TextManager.Get("deconstructor.input", fallBackTag: "uilabel.input"), font: GUI.SubHeadingFont) { Padding = Vector4.Zero };
+                    var inputLabel = new GUITextBlock(new RectTransform(Vector2.One, inputLabelArea.RectTransform), TextManager.Get("deconstructor.input", "uilabel.input"), font: GUIStyle.SubHeadingFont) { Padding = Vector4.Zero };
                     inputLabel.RectTransform.Resize(new Point((int) inputLabel.Font.MeasureString(inputLabel.Text).X, inputLabel.RectTransform.Rect.Height));
                     new GUIFrame(new RectTransform(Vector2.One, inputLabelArea.RectTransform), style: "HorizontalLine");
 
@@ -80,9 +80,9 @@ namespace Barotrauma.Items.Components
                             TextBlock = { AutoScaleHorizontal = true },
                             OnClicked = ToggleActive
                         };
-                            inSufficientPowerWarning = new GUITextBlock(new RectTransform(Vector2.One, activateButton.RectTransform), 
-                                TextManager.Get("DeconstructorNoPower"), textColor: GUI.Style.Orange, textAlignment: Alignment.Center, color: Color.Black, style: "OuterGlow", wrap: true)
-                            {
+                            inSufficientPowerWarning = new GUITextBlock(new RectTransform(Vector2.One, activateButton.RectTransform),
+                                TextManager.Get("DeconstructorNoPower"), textColor: GUIStyle.Orange, textAlignment: Alignment.Center, color: Color.Black, style: "OuterGlow", wrap: true)
+                                {
                                 HoverColor = Color.Black, 
                                 IgnoreLayoutGroups = true, 
                                 Visible = false, 
@@ -99,7 +99,7 @@ namespace Barotrauma.Items.Components
                     Stretch = true, 
                     RelativeSpacing = 0.05f
                 };
-                    var outputLabel = new GUITextBlock(new RectTransform(new Vector2(0f, 1.0f), outputLabelArea.RectTransform), TextManager.Get("uilabel.output"), font: GUI.SubHeadingFont) { Padding = Vector4.Zero };
+                    var outputLabel = new GUITextBlock(new RectTransform(new Vector2(0f, 1.0f), outputLabelArea.RectTransform), TextManager.Get("uilabel.output"), font: GUIStyle.SubHeadingFont) { Padding = Vector4.Zero };
                     outputLabel.RectTransform.Resize(new Point((int) outputLabel.Font.MeasureString(outputLabel.Text).X, outputLabel.RectTransform.Rect.Height));
                     new GUIFrame(new RectTransform(Vector2.One, outputLabelArea.RectTransform), style: "HorizontalLine");
 
@@ -123,7 +123,7 @@ namespace Barotrauma.Items.Components
                 }
                 else
                 {
-                    infoArea.Text = TextManager.Get(InfoText, returnNull: true) ?? InfoText;
+                    infoArea.Text = TextManager.Get(InfoText).Fallback(InfoText);
                 }
                 if (IsActive)
                 {
@@ -137,11 +137,11 @@ namespace Barotrauma.Items.Components
                     outputsFound = true;
                     if (!string.IsNullOrEmpty(deconstructItem.ActivateButtonText))
                     {
-                        string buttonText = TextManager.Get(deconstructItem.ActivateButtonText, returnNull: true) ?? deconstructItem.ActivateButtonText;
-                        string infoText =  string.Empty;
+                        LocalizedString buttonText = TextManager.Get(deconstructItem.ActivateButtonText).Fallback(deconstructItem.ActivateButtonText);
+                        LocalizedString infoText =  string.Empty;
                         if (!string.IsNullOrEmpty(deconstructItem.InfoText))
                         {
-                            infoText = TextManager.Get(deconstructItem.InfoText, returnNull: true) ?? deconstructItem.InfoText;
+                            infoText = TextManager.Get(deconstructItem.InfoText).Fallback(deconstructItem.InfoText);
                         }
                         inputItem.GetComponent<GeneticMaterial>()?.ModifyDeconstructInfo(this, ref buttonText, ref infoText);
                         activateButton.Text = buttonText;
@@ -159,7 +159,7 @@ namespace Barotrauma.Items.Components
                     {
                         if (deconstructItem.RequiredOtherItem.Any() && !string.IsNullOrEmpty(deconstructItem.InfoTextOnOtherItemMissing))
                         {
-                            string missingItemName = TextManager.Get("entityname." + deconstructItem.RequiredOtherItem.First(), returnNull: true);
+                            LocalizedString missingItemName = TextManager.Get("entityname." + deconstructItem.RequiredOtherItem.First());
                             infoArea.Text = TextManager.GetWithVariable(deconstructItem.InfoTextOnOtherItemMissing, "[itemname]", missingItemName);
                         }
                     }
@@ -207,7 +207,7 @@ namespace Barotrauma.Items.Components
             overlayComponent.RectTransform.SetAsLastChild();
 
             if (!(inputContainer?.Inventory?.visualSlots is { } visualSlots)) { return; }
-
+            
             if (DeconstructItemsSimultaneously)
             {
                 for (int i = 0; i < InputContainer.Inventory.Capacity; i++)
@@ -227,13 +227,13 @@ namespace Barotrauma.Items.Components
                     new Rectangle(
                         slot.Rect.X, slot.Rect.Y + (int)(slot.Rect.Height * (1.0f - progressState)),
                         slot.Rect.Width, (int)(slot.Rect.Height * progressState)),
-                    GUI.Style.Green * 0.5f, isFilled: true);
+                    GUIStyle.Green * 0.5f, isFilled: true);
             }
         }
 
         public override void UpdateHUD(Character character, float deltaTime, Camera cam)
         {
-            inSufficientPowerWarning.Visible = CurrPowerConsumption > 0 && !hasPower;
+            inSufficientPowerWarning.Visible = IsActive && !hasPower;
         }
 
         private bool ToggleActive(GUIButton button, object obj)
@@ -246,7 +246,6 @@ namespace Barotrauma.Items.Components
             else
             {
                 SetActive(!IsActive, Character.Controlled);
-                currPowerConsumption = IsActive ? powerConsumption : 0.0f;
             }
 
             return true;

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Engine.cs

@@ -32,7 +32,7 @@ namespace Barotrauma.Items.Components
             get { return Vector2.Zero; }
         }
 
-        partial void InitProjSpecific(XElement element)
+        partial void InitProjSpecific(ContentXElement element)
         {
             var paddedFrame = new GUIFrame(new RectTransform(new Vector2(0.85f, 0.65f), GuiFrame.RectTransform, Anchor.Center)
             {
@@ -43,27 +43,27 @@ namespace Barotrauma.Items.Components
             powerIndicator = new GUITickBox(new RectTransform(new Vector2(0.45f, 0.8f), lightsArea.RectTransform, Anchor.Center, Pivot.CenterRight)
             {
                 RelativeOffset = new Vector2(-0.05f, 0)
-            }, TextManager.Get("EnginePowered"), font: GUI.SubHeadingFont, style: "IndicatorLightGreen")
+            }, TextManager.Get("EnginePowered"), font: GUIStyle.SubHeadingFont, style: "IndicatorLightGreen")
             {
                 CanBeFocused = false
             };
             autoControlIndicator = new GUITickBox(new RectTransform(new Vector2(0.45f, 0.8f), lightsArea.RectTransform, Anchor.Center, Pivot.CenterLeft)
             {
                 RelativeOffset = new Vector2(0.05f, 0)
-            }, TextManager.Get("PumpAutoControl", fallBackTag: "ReactorAutoControl"), font: GUI.SubHeadingFont, style: "IndicatorLightYellow")
+            }, TextManager.Get("PumpAutoControl", "ReactorAutoControl"), font: GUIStyle.SubHeadingFont, style: "IndicatorLightYellow")
             {
                 Selected = false,
                 Enabled = false,
                 ToolTip = TextManager.Get("AutoControlTip")
             };
             powerIndicator.TextBlock.Wrap = autoControlIndicator.TextBlock.Wrap = true;
-            powerIndicator.TextBlock.OverrideTextColor(GUI.Style.TextColor);
-            autoControlIndicator.TextBlock.OverrideTextColor(GUI.Style.TextColor);
+            powerIndicator.TextBlock.OverrideTextColor(GUIStyle.TextColorNormal);
+            autoControlIndicator.TextBlock.OverrideTextColor(GUIStyle.TextColorNormal);
             GUITextBlock.AutoScaleAndNormalize(powerIndicator.TextBlock, autoControlIndicator.TextBlock);
 
             var sliderArea = new GUIFrame(new RectTransform(new Vector2(1, 0.6f), paddedFrame.RectTransform, Anchor.BottomLeft), style: null);
-            string powerLabel = TextManager.Get("EngineForce");
-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.3f), sliderArea.RectTransform, Anchor.TopCenter), "", textColor: GUI.Style.TextColor, font: GUI.SubHeadingFont, textAlignment: Alignment.Center)
+            LocalizedString powerLabel = TextManager.Get("EngineForce");
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.3f), sliderArea.RectTransform, Anchor.TopCenter), "", textColor: GUIStyle.TextColorNormal, font: GUIStyle.SubHeadingFont, textAlignment: Alignment.Center)
             {
                 AutoScaleHorizontal = true,
                 TextGetter = () => { return TextManager.AddPunctuation(':', powerLabel, (int)(targetForce) + " %"); }
@@ -90,12 +90,12 @@ namespace Barotrauma.Items.Components
 
             var textsArea = new GUIFrame(new RectTransform(new Vector2(1, 0.25f), sliderArea.RectTransform, Anchor.BottomCenter), style: null);
             var backwardsLabel = new GUITextBlock(new RectTransform(new Vector2(0.4f, 1.0f), textsArea.RectTransform, Anchor.CenterLeft), TextManager.Get("EngineBackwards"),
-                textColor: GUI.Style.TextColor, font: GUI.SubHeadingFont, textAlignment: Alignment.CenterLeft);
+                textColor: GUIStyle.TextColorNormal, font: GUIStyle.SubHeadingFont, textAlignment: Alignment.CenterLeft);
             var forwardsLabel = new GUITextBlock(new RectTransform(new Vector2(0.4f, 1.0f), textsArea.RectTransform, Anchor.CenterRight), TextManager.Get("EngineForwards"),
-                textColor: GUI.Style.TextColor, font: GUI.SubHeadingFont, textAlignment: Alignment.CenterRight);
+                textColor: GUIStyle.TextColorNormal, font: GUIStyle.SubHeadingFont, textAlignment: Alignment.CenterRight);
             GUITextBlock.AutoScaleAndNormalize(backwardsLabel, forwardsLabel);
 
-            foreach (XElement subElement in element.Elements())
+            foreach (var subElement in element.Elements())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
                 {
@@ -152,7 +152,7 @@ namespace Barotrauma.Items.Components
                 Vector2 drawPos = item.DrawPosition;
                 drawPos += PropellerPos * item.Scale;
                 drawPos.Y = -drawPos.Y;
-                spriteBatch.DrawCircle(drawPos, propellerDamage.DamageRange * item.Scale, 16, GUI.Style.Red, thickness: 2);
+                spriteBatch.DrawCircle(drawPos, propellerDamage.DamageRange * item.Scale, 16, GUIStyle.Red, thickness: 2);
             }
         }
 

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Fabricator.cs

@@ -37,7 +37,12 @@ namespace Barotrauma.Items.Components
 
         private FabricationRecipe pendingFabricatedItem;
 
-        private (Rectangle area, string text)? tooltip;
+        private class ToolTip
+        {
+            public Rectangle TargetElement;
+            public LocalizedString Tooltip;
+        }
+        private ToolTip tooltip;
 
         private GUITextBlock requiredTimeBlock;
 
@@ -57,7 +62,7 @@ namespace Barotrauma.Items.Components
             var paddedFrame = new GUILayoutGroup(new RectTransform(new Vector2(0.95f, 0.9f), GuiFrame.RectTransform, Anchor.Center), childAnchor: Anchor.TopCenter);
 
             // === LABEL === //
-            new GUITextBlock(new RectTransform(new Vector2(1f, 0.05f), paddedFrame.RectTransform), item.Name, font: GUI.SubHeadingFont)
+            new GUITextBlock(new RectTransform(new Vector2(1f, 0.05f), paddedFrame.RectTransform), item.Name, font: GUIStyle.SubHeadingFont)
             {
                 TextAlignment = Alignment.Center,
                 AutoScaleVertical = true
@@ -84,7 +89,7 @@ namespace Barotrauma.Items.Components
                             RelativeSpacing = 0.03f, 
                             UserData = "filterarea"
                         };
-                            new GUITextBlock(new RectTransform(new Vector2(0.2f, 1f), filterArea.RectTransform), TextManager.Get("serverlog.filter"), font: GUI.SubHeadingFont)
+                            new GUITextBlock(new RectTransform(new Vector2(0.2f, 1f), filterArea.RectTransform), TextManager.Get("serverlog.filter"), font: GUIStyle.SubHeadingFont)
                             {
                                 Padding = Vector4.Zero, 
                                 AutoScaleVertical = true
@@ -132,7 +137,7 @@ namespace Barotrauma.Items.Components
                     Stretch = true, 
                     RelativeSpacing = 0.03f
                 };
-                    var inputLabel = new GUITextBlock(new RectTransform(Vector2.One, separatorArea.RectTransform), TextManager.Get("fabricator.input", fallBackTag: "uilabel.input"), font: GUI.SubHeadingFont) { Padding = Vector4.Zero };
+                    var inputLabel = new GUITextBlock(new RectTransform(Vector2.One, separatorArea.RectTransform), TextManager.Get("fabricator.input", "uilabel.input"), font: GUIStyle.SubHeadingFont) { Padding = Vector4.Zero };
                     inputLabel.RectTransform.Resize(new Point((int) inputLabel.Font.MeasureString(inputLabel.Text).X, inputLabel.RectTransform.Rect.Height));
                     new GUIFrame(new RectTransform(Vector2.One, separatorArea.RectTransform), style: "HorizontalLine");
 
@@ -154,7 +159,7 @@ namespace Barotrauma.Items.Components
                         };
                             // === POWER WARNING === //
                             inSufficientPowerWarning = new GUITextBlock(new RectTransform(Vector2.One, activateButton.RectTransform),
-                                TextManager.Get("FabricatorNoPower"), textColor: GUI.Style.Orange, textAlignment: Alignment.Center, color: Color.Black, style: "OuterGlow", wrap: true)
+                                TextManager.Get("FabricatorNoPower"), textColor: GUIStyle.Orange, textAlignment: Alignment.Center, color: Color.Black, style: "OuterGlow", wrap: true)
                             {
                                 HoverColor = Color.Black,
                                 IgnoreLayoutGroups = true,
@@ -168,7 +173,7 @@ namespace Barotrauma.Items.Components
         {
             itemList.Content.RectTransform.ClearChildren();
 
-            foreach (FabricationRecipe fi in fabricationRecipes)
+            foreach (FabricationRecipe fi in fabricationRecipes.Values)
             {
                 var frame = new GUIFrame(new RectTransform(new Point(itemList.Rect.Width, (int)(40 * GUI.yScale)), itemList.Content.RectTransform), style: null)
                 {
@@ -180,8 +185,8 @@ namespace Barotrauma.Items.Components
                 
                 var container = new GUILayoutGroup(new RectTransform(Vector2.One, frame.RectTransform),
                     childAnchor: Anchor.CenterLeft, isHorizontal: true) { RelativeSpacing = 0.02f };
-                    
-                var itemIcon = fi.TargetItem.InventoryIcon ?? fi.TargetItem.sprite;
+
+                var itemIcon = fi.TargetItem.InventoryIcon ?? fi.TargetItem.Sprite;
                 if (itemIcon != null)
                 {
                     new GUIImage(new RectTransform(new Point(frame.Rect.Height,frame.Rect.Height), container.RectTransform),
@@ -201,14 +206,13 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        private string GetRecipeNameAndAmount(FabricationRecipe fabricationRecipe)
+        private LocalizedString GetRecipeNameAndAmount(FabricationRecipe fabricationRecipe)
         {
             if (fabricationRecipe == null) { return ""; }
             if (fabricationRecipe.Amount > 1)
             {
                 return TextManager.GetWithVariables("fabricationrecipenamewithamount",
-                    new string[2] { "[name]", "[amount]" },
-                    new string[2] { fabricationRecipe.DisplayName, fabricationRecipe.Amount.ToString() });
+                    ("[name]", fabricationRecipe.DisplayName), ("[amount]", fabricationRecipe.Amount.ToString()));
             }
             else
             {
@@ -226,27 +230,6 @@ namespace Barotrauma.Items.Components
 
         partial void SelectProjSpecific(Character character)
         {
-            // TODO, This works fine as of now but if GUI.PreventElementOverlap ever gets fixed this block of code may become obsolete or detrimental.
-            // Only do this if there's only one linked component. If you link more containers then may
-            // GUI.PreventElementOverlap have mercy on your HUD layout
-            if (GuiFrame != null && item.linkedTo.Count(entity => entity is Item { DisplaySideBySideWhenLinked: true }) == 1)
-            {
-                foreach (MapEntity linkedTo in item.linkedTo)
-                {
-                    if (!(linkedTo is Item { DisplaySideBySideWhenLinked: true } linkedItem)) { continue; }
-                    if (!linkedItem.Components.Any()) { continue; }
-
-                    var itemContainer = linkedItem.GetComponent<ItemContainer>();
-                    if (itemContainer?.GuiFrame == null || itemContainer.AllowUIOverlap) { continue; }
-
-                    // how much spacing do we want between the components
-                    var padding = (int) (8 * GUI.Scale);
-                    // Move the linked container to the right and move the fabricator to the left
-                    itemContainer.GuiFrame.RectTransform.AbsoluteOffset = new Point(GuiFrame.Rect.Width / -2 - padding, 0);
-                    GuiFrame.RectTransform.AbsoluteOffset = new Point(itemContainer.GuiFrame.Rect.Width / 2 + padding, 0);
-                }
-            }
-            
             var nonItems = itemList.Content.Children.Where(c => !(c.UserData is FabricationRecipe)).ToList();
             nonItems.ForEach(i => itemList.Content.RemoveChild(i));
 
@@ -266,11 +249,11 @@ namespace Barotrauma.Items.Components
                     return itemPlacement1 > itemPlacement2 ? -1 : 1;
                 }
 
-                return string.Compare(item1.DisplayName, item2.DisplayName);
+                return string.Compare(item1.DisplayName.Value, item2.DisplayName.Value);
             });
 
             var sufficientSkillsText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.15f), itemList.Content.RectTransform),
-                TextManager.Get("fabricatorsufficientskills"), textColor: GUI.Style.Green, font: GUI.SubHeadingFont)
+                    TextManager.Get("fabricatorsufficientskills"), textColor: GUIStyle.Green, font: GUIStyle.SubHeadingFont)
             {
                 AutoScaleHorizontal = true,
                 CanBeFocused = false
@@ -278,8 +261,8 @@ namespace Barotrauma.Items.Components
             sufficientSkillsText.RectTransform.SetAsFirstChild();
 
             var insufficientSkillsText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.15f), itemList.Content.RectTransform),
-                TextManager.Get("fabricatorinsufficientskills"), textColor: Color.Orange, font: GUI.SubHeadingFont)
-            {
+                TextManager.Get("fabricatorinsufficientskills"), textColor: Color.Orange, font: GUIStyle.SubHeadingFont)
+                {
                 AutoScaleHorizontal = true,
                 CanBeFocused = false
             };
@@ -290,8 +273,8 @@ namespace Barotrauma.Items.Components
             }
 
             var requiresRecipeText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.15f), itemList.Content.RectTransform),
-                TextManager.Get("fabricatorrequiresrecipe"), textColor: Color.Red, font: GUI.SubHeadingFont)
-            {
+                TextManager.Get("fabricatorrequiresrecipe"), textColor: Color.Red, font: GUIStyle.SubHeadingFont)
+                {
                 AutoScaleHorizontal = true,
                 CanBeFocused = false
             };
@@ -330,7 +313,7 @@ namespace Barotrauma.Items.Components
                 }
                 foreach (Item item in inputContainer.Inventory.AllItems)
                 {
-                    missingItems.Remove(missingItems.FirstOrDefault(mi => mi.ItemPrefabs.Contains(item.prefab)));
+                    missingItems.Remove(missingItems.FirstOrDefault(mi => mi.ItemPrefabs.Contains(item.Prefab)));
                 }
                 var missingCounts = missingItems.GroupBy(missingItem => missingItem).ToDictionary(x => x.Key, x => x.Count());
                 missingItems = missingItems.Distinct().ToList();
@@ -356,10 +339,10 @@ namespace Barotrauma.Items.Components
                                 if (availableSlotIndex < 0) { continue; }
                                 if (rootInventory.visualSlots[availableSlotIndex].HighlightTimer <= 0.0f)
                                 {
-                                    rootInventory.visualSlots[availableSlotIndex].ShowBorderHighlight(GUI.Style.Green, 0.5f, 0.5f, 0.2f);
+                                    rootInventory.visualSlots[availableSlotIndex].ShowBorderHighlight(GUIStyle.Green, 0.5f, 0.5f, 0.2f);
                                     if (slotIndex < inputContainer.Capacity)
                                     {
-                                        inputContainer.Inventory.visualSlots[slotIndex].ShowBorderHighlight(GUI.Style.Green, 0.5f, 0.5f, 0.2f);
+                                        inputContainer.Inventory.visualSlots[slotIndex].ShowBorderHighlight(GUIStyle.Green, 0.5f, 0.5f, 0.2f);
                                     }
                                 }
                             }
@@ -367,7 +350,7 @@ namespace Barotrauma.Items.Components
 
                     if (slotIndex >= inputContainer.Capacity) { break; }
 
-                    var itemIcon = requiredItem.ItemPrefabs.First().InventoryIcon ?? requiredItem.ItemPrefabs.First().sprite;
+                    var itemIcon = requiredItem.ItemPrefabs.First().InventoryIcon ?? requiredItem.ItemPrefabs.First().Sprite;
                     Rectangle slotRect = inputContainer.Inventory.visualSlots[slotIndex].Rect;
                     itemIcon.Draw(
                         spriteBatch,
@@ -380,9 +363,9 @@ namespace Barotrauma.Items.Components
                     {
                         Vector2 stackCountPos = new Vector2(slotRect.Right, slotRect.Bottom);
                         string stackCountText = "x" + missingCounts[requiredItem];
-                        stackCountPos -= GUI.SmallFont.MeasureString(stackCountText) + new Vector2(4, 2);
-                        GUI.SmallFont.DrawString(spriteBatch, stackCountText, stackCountPos + Vector2.One, Color.Black);
-                        GUI.SmallFont.DrawString(spriteBatch, stackCountText, stackCountPos, Color.White);
+                        stackCountPos -= GUIStyle.SmallFont.MeasureString(stackCountText) + new Vector2(4, 2);
+                        GUIStyle.SmallFont.DrawString(spriteBatch, stackCountText, stackCountPos + Vector2.One, Color.Black);
+                        GUIStyle.SmallFont.DrawString(spriteBatch, stackCountText, stackCountPos, Color.White);
                     }
 
                     if (requiredItem.UseCondition && requiredItem.MinCondition < 1.0f)
@@ -401,13 +384,13 @@ namespace Barotrauma.Items.Components
                         GUI.DrawRectangle(spriteBatch, new Rectangle(slotRect.X + spacing, slotRect.Bottom - spacing - height, slotRect.Width - spacing * 2, height), Color.Black * 0.8f, true);
                         GUI.DrawRectangle(spriteBatch,
                             new Rectangle(slotRect.X + spacing, slotRect.Bottom - spacing - height, (int)((slotRect.Width - spacing * 2) * condition), height),
-                            GUI.Style.Green * 0.8f, true);
+                            GUIStyle.Green * 0.8f, true);
                     }
 
                     if (slotRect.Contains(PlayerInput.MousePosition))
                     {
                         var suitableIngredients = requiredItem.ItemPrefabs.Select(ip => ip.Name);
-                        string toolTipText = string.Join(", ", suitableIngredients.Count() > 3 ? suitableIngredients.SkipLast(suitableIngredients.Count() - 3) : suitableIngredients);
+                        LocalizedString toolTipText = string.Join(", ", suitableIngredients.Count() > 3 ? suitableIngredients.SkipLast(suitableIngredients.Count() - 3) : suitableIngredients);
                         if (suitableIngredients.Count() > 3) { toolTipText += "..."; }
                         if (requiredItem.UseCondition && requiredItem.MinCondition < 1.0f)
                         {
@@ -428,11 +411,11 @@ namespace Barotrauma.Items.Components
                         {
                             toolTipText = TextManager.GetWithVariable("displayname.emptyitem", "[itemname]", toolTipText);
                         }
-                        if (!string.IsNullOrEmpty(requiredItem.ItemPrefabs.First().Description))
+                        if (!requiredItem.ItemPrefabs.First().Description.IsNullOrEmpty())
                         {
                             toolTipText += '\n' + requiredItem.ItemPrefabs.First().Description;
                         }
-                        tooltip = (slotRect, toolTipText);
+                        tooltip = new ToolTip { TargetElement = slotRect, Tooltip = toolTipText };
                     }
 
                     slotIndex++;
@@ -456,12 +439,12 @@ namespace Barotrauma.Items.Components
                         new Rectangle(
                             slotRect.X, slotRect.Y + (int)(slotRect.Height * (1.0f - clampedProgressState)),
                             slotRect.Width, (int)(slotRect.Height * clampedProgressState)),
-                        GUI.Style.Green * 0.5f, isFilled: true);
+                        GUIStyle.Green * 0.5f, isFilled: true);
                 }
 
                 if (outputContainer.Inventory.IsEmpty())
                 {
-                    var itemIcon = targetItem.TargetItem.InventoryIcon ?? targetItem.TargetItem.sprite;
+                    var itemIcon = targetItem.TargetItem.InventoryIcon ?? targetItem.TargetItem.Sprite;
                     itemIcon.Draw(
                         spriteBatch,
                         slotRect.Center.ToVector2(),
@@ -472,7 +455,7 @@ namespace Barotrauma.Items.Components
             
             if (tooltip != null)
             {
-                GUIComponent.DrawToolTip(spriteBatch, tooltip.Value.text, tooltip.Value.area);
+                GUIComponent.DrawToolTip(spriteBatch, tooltip.Tooltip, tooltip.TargetElement);
                 tooltip = null;
             }
         }
@@ -485,12 +468,11 @@ namespace Barotrauma.Items.Components
                 return true;
             }
 
-            filter = filter.ToLower();
             foreach (GUIComponent child in itemList.Content.Children)
             {
                 FabricationRecipe recipe = child.UserData as FabricationRecipe;
                 if (recipe?.DisplayName == null) { continue; }
-                child.Visible = recipe.DisplayName.ToLower().Contains(filter);
+                child.Visible = recipe.DisplayName.Contains(filter, StringComparison.OrdinalIgnoreCase);
             }
 
             HideEmptyItemListCategories();
@@ -538,24 +520,26 @@ namespace Barotrauma.Items.Components
             var paddedFrame = new GUILayoutGroup(new RectTransform(new Vector2(1f, 0.9f), selectedItemFrame.RectTransform, Anchor.Center)) { RelativeSpacing = 0.03f };
             var paddedReqFrame = new GUILayoutGroup(new RectTransform(new Vector2(1f, 0.9f), selectedItemReqsFrame.RectTransform, Anchor.Center)) { RelativeSpacing = 0.03f };
 
-            string itemName = GetRecipeNameAndAmount(selectedItem);
-            string name = itemName;
+            LocalizedString itemName = GetRecipeNameAndAmount(selectedItem);
+            LocalizedString name = itemName;
 
             float quality = GetFabricatedItemQuality(selectedItem, user);
             if (quality > 0)
             {
-                name = TextManager.GetWithVariable("itemname.quality" + (int)quality, "[itemname]", itemName + '\n', fallBackTag: "itemname.quality3");
+                name = TextManager.GetWithVariable("itemname.quality" + (int)quality, "[itemname]", itemName + '\n')
+                    .Fallback(TextManager.GetWithVariable("itemname.quality3", "[itemname]", itemName + '\n'));
             }
 
             var nameBlock = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedFrame.RectTransform),
-               name, textAlignment: Alignment.TopLeft, textColor: Color.Aqua, font: GUI.SubHeadingFont, parseRichText: true)
+               RichString.Rich(name), textAlignment: Alignment.TopLeft, textColor: Color.Aqua, font: GUIStyle.SubHeadingFont)
             {
                 AutoScaleHorizontal = true
             };
             nameBlock.Padding = new Vector4(0, nameBlock.Padding.Y, GUI.IntScale(5), nameBlock.Padding.W);
             if (nameBlock.TextScale < 0.7f)
             {
-                nameBlock.SetRichText(TextManager.GetWithVariable("itemname.quality" + (int)quality, "[itemname]", itemName, fallBackTag: "itemname.quality3"));
+                nameBlock.SetRichText(TextManager.GetWithVariable("itemname.quality" + (int)quality, "[itemname]", itemName)
+                    .Fallback(TextManager.GetWithVariable("itemname.quality3", "[itemname]", itemName)));
                 nameBlock.AutoScaleHorizontal = false;
                 nameBlock.TextScale = 0.7f;
                 nameBlock.Wrap = true;
@@ -563,35 +547,35 @@ namespace Barotrauma.Items.Components
                 nameBlock.RectTransform.MinSize = new Point(0, (int)(nameBlock.TextSize.Y * nameBlock.TextScale));
             }            
             
-            if (!string.IsNullOrWhiteSpace(selectedItem.TargetItem.Description))
+            if (!selectedItem.TargetItem.Description.IsNullOrEmpty())
             {
                 var description = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedFrame.RectTransform),
                     selectedItem.TargetItem.Description,
-                    font: GUI.SmallFont, wrap: true);
+                    font: GUIStyle.SmallFont, wrap: true);
                 description.Padding = new Vector4(0, description.Padding.Y, description.Padding.Z, description.Padding.W);
             
                 while (description.Rect.Height + nameBlock.Rect.Height > paddedFrame.Rect.Height)
                 {
                     var lines = description.WrappedText.Split('\n');
-                    if (lines.Length <= 1) { break; }
-                    var newString = string.Join('\n', lines.Take(lines.Length - 1));
+                    if (lines.Count <= 1) { break; }
+                    var newString = string.Join('\n', lines.Take(lines.Count - 1));
                     description.Text = newString.Substring(0, newString.Length - 4) + "...";
                     description.CalculateHeightFromText();
                     description.ToolTip = selectedItem.TargetItem.Description;
                 }
             }
             
-            List<Skill> inadequateSkills = new List<Skill>();
+            IEnumerable<Skill> inadequateSkills = Enumerable.Empty<Skill>();
             if (user != null)
             {
-                inadequateSkills = selectedItem.RequiredSkills.FindAll(skill => user.GetSkillLevel(skill.Identifier) < Math.Round(skill.Level * SkillRequirementMultiplier));
+                inadequateSkills = selectedItem.RequiredSkills.Where(skill => user.GetSkillLevel(skill.Identifier) < Math.Round(skill.Level * SkillRequirementMultiplier));
             }
             
             if (selectedItem.RequiredSkills.Any())
             {
-                string text = "";
+                LocalizedString text = "";
                 new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedReqFrame.RectTransform), 
-                    TextManager.Get("FabricatorRequiredSkills"), textColor: inadequateSkills.Any() ? GUI.Style.Red : GUI.Style.Green, font: GUI.SubHeadingFont)
+                    TextManager.Get("FabricatorRequiredSkills"), textColor: inadequateSkills.Any() ? GUIStyle.Red : GUIStyle.Green, font: GUIStyle.SubHeadingFont)
                 {
                     AutoScaleHorizontal = true,
                 };
@@ -600,7 +584,7 @@ namespace Barotrauma.Items.Components
                     text += TextManager.Get("SkillName." + skill.Identifier) + " " + TextManager.Get("Lvl").ToLower() + " " + Math.Round(skill.Level * SkillRequirementMultiplier);
                     if (skill != selectedItem.RequiredSkills.Last()) { text += "\n"; }
                 }
-                new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedReqFrame.RectTransform), text, font: GUI.SmallFont);
+                new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedReqFrame.RectTransform), text, font: GUIStyle.SmallFont);
             }
 
             float degreeOfSuccess = user == null ? 0.0f : FabricationDegreeOfSuccess(user, selectedItem.RequiredSkills);
@@ -610,13 +594,13 @@ namespace Barotrauma.Items.Components
                 (user == null ? selectedItem.RequiredTime : GetRequiredTime(selectedItem, user));
             
             new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedReqFrame.RectTransform), 
-                TextManager.Get("FabricatorRequiredTime") , textColor: ToolBox.GradientLerp(degreeOfSuccess, GUI.Style.Red, Color.Yellow, GUI.Style.Green), font: GUI.SubHeadingFont)
+                TextManager.Get("FabricatorRequiredTime") , textColor: ToolBox.GradientLerp(degreeOfSuccess, GUIStyle.Red, Color.Yellow, GUIStyle.Green), font: GUIStyle.SubHeadingFont)
             {
                 AutoScaleHorizontal = true,
             };
                 
             requiredTimeBlock = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedReqFrame.RectTransform), ToolBox.SecondsToReadableTime(requiredTime), 
-                font: GUI.SmallFont);
+                font: GUIStyle.SmallFont);
             return true;
         }
 
@@ -649,7 +633,7 @@ namespace Barotrauma.Items.Components
             if (fabricatedItem == null && 
                 !outputContainer.Inventory.CanBePut(selectedItem.TargetItem, selectedItem.OutCondition * selectedItem.TargetItem.Health))
             {
-                outputSlot.Flash(GUI.Style.Red);
+                outputSlot.Flash(GUIStyle.Red);
                 return false;
             }
             
@@ -676,7 +660,7 @@ namespace Barotrauma.Items.Components
         public override void UpdateHUD(Character character, float deltaTime, Camera cam)
         {
             activateButton.Enabled = false;
-            inSufficientPowerWarning.Visible = currPowerConsumption > 0 && !hasPower;
+            inSufficientPowerWarning.Visible = IsActive && !hasPower;
 
             if (!IsActive)
             {
@@ -723,31 +707,31 @@ namespace Barotrauma.Items.Components
 
         public void ClientWrite(IWriteMessage msg, object[] extraData = null)
         {
-            int itemIndex = pendingFabricatedItem == null ? -1 : fabricationRecipes.IndexOf(pendingFabricatedItem);
-            msg.WriteRangedInteger(itemIndex, -1, fabricationRecipes.Count - 1);
+            uint recipeHash = pendingFabricatedItem?.RecipeHash ?? 0;
+            msg.Write(recipeHash);
         }
 
         public void ClientRead(ServerNetObject type, IReadMessage msg, float sendingTime)
         {
             FabricatorState newState = (FabricatorState)msg.ReadByte();
             float newTimeUntilReady = msg.ReadSingle();
-            int itemIndex = msg.ReadRangedInteger(-1, fabricationRecipes.Count - 1);
+            uint recipeHash = msg.ReadUInt32();
             UInt16 userID = msg.ReadUInt16();
             Character user = Entity.FindEntityByID(userID) as Character;
 
             State = newState;
-            if (newState == FabricatorState.Stopped || itemIndex == -1)
+            if (newState == FabricatorState.Stopped || recipeHash == 0)
             {
                 CancelFabricating();
             }
             else if (newState == FabricatorState.Active || newState == FabricatorState.Paused)
             {
                 //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; }
 
-                SelectItem(user, fabricationRecipes[itemIndex]);
-                StartFabricating(fabricationRecipes[itemIndex], user);
+                SelectItem(user, fabricationRecipes[recipeHash]);
+                StartFabricating(fabricationRecipes[recipeHash], user);
             }
             timeUntilReady = newTimeUntilReady;
         }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/MiniMap.cs

@@ -146,7 +146,7 @@ namespace Barotrauma.Items.Components
     {
         private GUIFrame submarineContainer;
 
-        private GUIFrame hullInfoFrame;
+        private GUIFrame? hullInfoFrame;
         private GUIScissorComponent? scissorComponent;
         private GUIComponent? miniMapContainer;
         private GUIComponent miniMapFrame;
@@ -160,7 +160,7 @@ namespace Barotrauma.Items.Components
 
         private GUITextBlock tooltipHeader, tooltipFirstLine, tooltipSecondLine, tooltipThirdLine;
 
-        private string noPowerTip = string.Empty;
+        private LocalizedString noPowerTip = string.Empty;
 
         private readonly List<Submarine> displayedSubs = new List<Submarine>();
 
@@ -213,7 +213,7 @@ namespace Barotrauma.Items.Components
         public static readonly Color MiniMapBaseColor = new Color(15, 178, 107);
 
         private static readonly Color WetHullColor = new Color(11, 122, 205),
-                                      DoorIndicatorColor = GUI.Style.Green,
+                                      DoorIndicatorColor = GUIStyle.Green,
                                       NoPowerDoorColor = DoorIndicatorColor * 0.1f,
                                       DefaultNeutralColor = MiniMapBaseColor * 0.8f,
                                       HoverColor = Color.White,
@@ -221,7 +221,7 @@ namespace Barotrauma.Items.Components
                                       HullWaterColor = new Color(17, 173, 179) * 0.5f,
                                       HullWaterLineColor = Color.LightBlue * 0.5f,
                                       NoPowerColor = MiniMapBaseColor * 0.1f,
-                                      ElectricalBaseColor = GUI.Style.Orange,
+                                      ElectricalBaseColor = GUIStyle.Orange,
                                       NoPowerElectricalColor = ElectricalBaseColor * 0.1f;
 
         partial void InitProjSpecific()
@@ -292,7 +292,7 @@ namespace Barotrauma.Items.Components
                 }
             }
 
-            List<Order> reports = Order.PrefabList.FindAll(o => o.IsReport && o.SymbolSprite != null && !o.Hidden);
+            OrderPrefab[] reports = OrderPrefab.Prefabs.Where(o => o.IsReport && o.SymbolSprite != null && !o.Hidden).ToArray();
 
             GUIFrame bottomFrame = new GUIFrame(new RectTransform(new Vector2(0.5f, 0.15f), paddedContainer.RectTransform, Anchor.BottomCenter) { MaxSize = new Point(int.MaxValue, GUI.IntScale(40)) }, style: null)
             {
@@ -414,7 +414,7 @@ namespace Barotrauma.Items.Components
         public override void AddToGUIUpdateList(int order = 0)
         {
             base.AddToGUIUpdateList(order);
-            hullInfoFrame.AddToGUIUpdateList(order: order + 1);
+            hullInfoFrame?.AddToGUIUpdateList(order: order + 1);
             if (currentMode == MiniMapMode.ItemFinder && searchBar.Selected)
             {
                 searchAutoComplete?.AddToGUIUpdateList(order: order + 1);
@@ -507,7 +507,7 @@ namespace Barotrauma.Items.Components
                         {
                             Vector2 origin = weaponSprite.Origin;
                             float scale = parentWidth / Math.Max(weaponSprite.size.X, weaponSprite.size.Y);
-                            Color color = !hasPower ? NoPowerColor : turret.ActiveUser is null ? Color.DimGray : GUI.Style.Green;
+                            Color color = !hasPower ? NoPowerColor : turret.ActiveUser is null ? Color.DimGray : GUIStyle.Green;
                             weaponSprite.Draw(batch, center, color, origin, rotation, scale, it.SpriteEffects);
                         }
                     });
@@ -556,7 +556,7 @@ namespace Barotrauma.Items.Components
                         dragMapStart = PlayerInput.MousePosition;
                     }
                 }
-
+                
                 if (currentMode != MiniMapMode.HullStatus && Math.Abs(PlayerInput.ScrollWheelSpeed) > 0 && (GUI.MouseOn == scissorComponent || scissorComponent.IsParentOf(GUI.MouseOn)))
                 {
                     float newZoom = Math.Clamp(Zoom + PlayerInput.ScrollWheelSpeed / 1000.0f * Zoom, minZoom, maxZoom);
@@ -664,11 +664,11 @@ namespace Barotrauma.Items.Components
         {
             if (Voltage < MinVoltage)
             {
-                Vector2 textSize = GUI.Font.MeasureString(noPowerTip);
+                Vector2 textSize = GUIStyle.Font.MeasureString(noPowerTip);
                 Vector2 textPos = GuiFrame.Rect.Center.ToVector2();
-                Color noPowerColor = GUI.Style.Orange * (float)Math.Abs(Math.Sin(Timing.TotalTime));
+                Color noPowerColor = GUIStyle.Orange * (float)Math.Abs(Math.Sin(Timing.TotalTime));
 
-                GUI.DrawString(spriteBatch, textPos - textSize / 2, noPowerTip, noPowerColor, Color.Black * 0.8f, font: GUI.SubHeadingFont);
+                GUI.DrawString(spriteBatch, textPos - textSize / 2, noPowerTip, noPowerColor, Color.Black * 0.8f, font: GUIStyle.SubHeadingFont);
                 return;
             }
 
@@ -679,7 +679,7 @@ namespace Barotrauma.Items.Components
                 spriteBatch.Begin(SpriteSortMode.Deferred, samplerState: GUI.SamplerState, rasterizerState: GameMain.ScissorTestEnable);
                 spriteBatch.GraphicsDevice.ScissorRectangle = submarineContainer.Rect;
 
-                var sprite = GUI.Style.UIGlowSolidCircular?.Sprite;
+                var sprite = GUIStyle.UIGlowSolidCircular.Value?.Sprite;
                 float alpha = (MathF.Sin(blipState / maxBlipState * MathHelper.TwoPi) + 1.5f) * 0.5f;
                 if (sprite != null)
                 {
@@ -693,7 +693,7 @@ namespace Barotrauma.Items.Components
 
                         Vector2 scale = new Vector2(entityRect.Size.X / spriteSize.X, entityRect.Size.Y / spriteSize.Y) * 2.0f;
 
-                        Color color = ToolBox.GradientLerp(gap.Open, GUI.Style.HealthBarColorMedium, GUI.Style.HealthBarColorLow) * alpha;
+                        Color color = ToolBox.GradientLerp(gap.Open, GUIStyle.HealthBarColorMedium, GUIStyle.HealthBarColorLow) * alpha;
                         sprite.Draw(spriteBatch,
                             miniMapFrame.Rect.Location.ToVector2() + entityRect.Center,
                             color, origin: sprite.Origin, rotate: 0.0f, scale: scale);
@@ -710,7 +710,7 @@ namespace Barotrauma.Items.Components
 
                         if (item.CurrentHull is { } currentHull && currentHull == hull)
                         {
-                            Sprite? pingCircle = GUI.Style.YouAreHereCircle?.Sprite;
+                            Sprite pingCircle = GUIStyle.YouAreHereCircle.Value.Sprite;
                             if (pingCircle is null) { continue; }
 
                             Vector2 charPos = item.WorldPosition;
@@ -725,7 +725,7 @@ namespace Barotrauma.Items.Components
                             Vector2 drawPos = component.RectComponent.Rect.Location.ToVector2() + relativePos;
                             drawPos -= new Vector2(spriteSize, spriteSize) / 2f;
 
-                            pingCircle.Draw(spriteBatch, drawPos, GUI.Style.Red * 0.8f, Vector2.Zero, 0f, parentWidth / pingCircle.size.X);
+                            pingCircle.Draw(spriteBatch, drawPos, GUIStyle.Red * 0.8f, Vector2.Zero, 0f, parentWidth / pingCircle.size.X);
                         }
                     }
                 }
@@ -805,7 +805,7 @@ namespace Barotrauma.Items.Components
 
         private void CreateItemFrame(ItemPrefab prefab, RectTransform parent)
         {
-            Sprite sprite = prefab.InventoryIcon ?? prefab.sprite;
+            Sprite sprite = prefab.InventoryIcon ?? prefab.Sprite;
             if (sprite is null) { return; }
             GUIFrame frame = new GUIFrame(new RectTransform(new Vector2(1f, 0.25f), parent), style: "ListBoxElement")
             {
@@ -821,7 +821,7 @@ namespace Barotrauma.Items.Components
                 Color = prefab.InventoryIconColor,
                 UserData = prefab
             };
-
+            
             var nameText = new GUITextBlock(new RectTransform(Vector2.One, layout.RectTransform), prefab.Name);
             nameText.RectTransform.SizeChanged += () =>
             {
@@ -837,7 +837,7 @@ namespace Barotrauma.Items.Components
 
                 if (first is null)
                 {
-                    searchBar.Flash(GUI.Style.Red);
+                    searchBar.Flash(GUIStyle.Red);
                     return;
                 }
                 searchedPrefab = first;
@@ -890,7 +890,7 @@ namespace Barotrauma.Items.Components
         {
             if (item.Submarine == null) { return; }
 
-            hullInfoFrame.Visible = false;
+            if (hullInfoFrame != null) { hullInfoFrame.Visible = false; }
             reportFrame.Visible = false;
             searchBarFrame.Visible = false;
             electricalFrame.Visible = false;
@@ -1029,7 +1029,7 @@ namespace Barotrauma.Items.Components
                 {
                     float amount = 1f + hullData.LinkedHulls.Count;
                     gapOpenSum = hull.ConnectedGaps.Concat(hullData.LinkedHulls.SelectMany(h => h.ConnectedGaps)).Where(g => !g.IsRoomToRoom && !g.HiddenInGame).Sum(g => g.Open) / amount;
-                    borderColor = Color.Lerp(neutralColor, GUI.Style.Red, Math.Min(gapOpenSum, 1.0f));
+                    borderColor = Color.Lerp(neutralColor, GUIStyle.Red, Math.Min(gapOpenSum, 1.0f));
                 }
 
                 bool isHoveringOver = canHoverOverHull && GUI.MouseOn == component;
@@ -1037,28 +1037,28 @@ namespace Barotrauma.Items.Components
                 // When drawing tooltip we are only interested in the component we are hovering over
                 if (isHoveringOver)
                 {
-                    string header = hull.DisplayName;
+                    LocalizedString header = hull.DisplayName;
 
                     float? oxygenAmount = hullData.HullOxygenAmount,
                            waterAmount = hullData.HullWaterAmount;
 
-                    string line1 = gapOpenSum > 0.1f ? TextManager.Get("MiniMapHullBreach") : string.Empty;
-                    Color line1Color = GUI.Style.Red;
+                    LocalizedString line1 = gapOpenSum > 0.1f ? TextManager.Get("MiniMapHullBreach") : string.Empty;
+                    Color line1Color = GUIStyle.Red;
 
-                    string line2 = oxygenAmount == null ?
+                    LocalizedString line2 = oxygenAmount == null ?
                         TextManager.Get("MiniMapAirQualityUnavailable") :
                         TextManager.AddPunctuation(':', TextManager.Get("MiniMapAirQuality"), (int)Math.Round(oxygenAmount.Value) + "%");
-                    Color line2Color = oxygenAmount == null ? GUI.Style.Red : Color.Lerp(GUI.Style.Red, Color.LightGreen, (float)oxygenAmount / 100.0f);
+                    Color line2Color = oxygenAmount == null ? GUIStyle.Red : Color.Lerp(GUIStyle.Red, Color.LightGreen, (float)oxygenAmount / 100.0f);
 
-                    string line3 = waterAmount == null ?
+                    LocalizedString line3 = waterAmount == null ?
                         TextManager.Get("MiniMapWaterLevelUnavailable") :
                         TextManager.AddPunctuation(':', TextManager.Get("MiniMapWaterLevel"), (int)Math.Round(waterAmount.Value * 100.0f) + "%");
-                    Color line3Color = waterAmount == null ? GUI.Style.Red : Color.Lerp(Color.LightGreen, GUI.Style.Red, (float)waterAmount);
+                    Color line3Color = waterAmount == null ? GUIStyle.Red : Color.Lerp(Color.LightGreen, GUIStyle.Red, (float)waterAmount);
 
                     SetTooltip(borderComponent.Rect.Center, header, line1, line2, line3, line1Color, line2Color, line3Color);
                 }
 
-                bool draggingReport = GameMain.GameSession?.CrewManager?.DraggedOrder != null;
+                bool draggingReport = GameMain.GameSession?.CrewManager?.DraggedOrderPrefab != null;
                 // When setting the colors we want to know the linked hulls too or else the linked hull will not realize its being hovered over and reset the border color
                 foreach (Hull linkedHull in hullData.LinkedHulls)
                 {
@@ -1090,7 +1090,7 @@ namespace Barotrauma.Items.Components
             foreach (var (entity, miniMapGuiComponent) in electricalMapComponents)
             {
                 if (!(entity is Item it)) { continue; }
-                if (!electricalChildren.TryGetValue(miniMapGuiComponent, out GUIComponent component)) { continue; }
+                if (!electricalChildren.TryGetValue(miniMapGuiComponent, out GUIComponent? component)) { continue; }
 
                 if (entity.Removed)
                 {
@@ -1106,12 +1106,12 @@ namespace Barotrauma.Items.Components
                 if (Voltage < MinVoltage || !miniMapGuiComponent.RectComponent.Visible) { continue; }
 
                 int durability = (int)(it.Condition / (it.MaxCondition / it.MaxRepairConditionMultiplier) * 100f);
-                Color color = ToolBox.GradientLerp(durability / 100f, GUI.Style.Red, GUI.Style.Orange, GUI.Style.Green, GUI.Style.Green);
+                Color color = ToolBox.GradientLerp(durability / 100f, GUIStyle.Red, GUIStyle.Orange, GUIStyle.Green, GUIStyle.Green);
 
                 if (GUI.MouseOn == component)
                 {
-                    string line1 = string.Empty;
-                    string line2 = string.Empty;
+                    LocalizedString line1 = string.Empty;
+                    LocalizedString line2 = string.Empty;
 
                     if (it.GetComponent<PowerContainer>() is { } battery)
                     {
@@ -1120,13 +1120,21 @@ namespace Barotrauma.Items.Components
                     }
                     else if (it.GetComponent<PowerTransfer>() is { } powerTransfer)
                     {
-                        int current = (int)-powerTransfer.CurrPowerConsumption, load = (int)powerTransfer.PowerLoad;
+                        int current = 0, load = 0;
+                        if (powerTransfer.PowerConnections.Count > 0 && powerTransfer.PowerConnections[0].Grid != null)
+                        {
+                            current = (int)powerTransfer.PowerConnections[0].Grid.Power;
+                            load = (int)powerTransfer.PowerConnections[0].Grid.Load;
+                        }
 
-                        line1 = TextManager.GetWithVariable("statusmonitor.junctionpower.tooltip", "[amount]", current.ToString(), fallBackTag: "statusmonitor.junctioncurrent.tooltip");
-                        line2 = TextManager.GetWithVariables("statusmonitor.junctionload.tooltip", new string[] { "[amount]", "[load]" }, new string[] { load.ToString(), load.ToString() });
+                        line1 = TextManager.GetWithVariable("statusmonitor.junctionpower.tooltip", "[amount]", current.ToString())
+                            .Fallback(TextManager.GetWithVariable("statusmonitor.junctioncurrent.tooltip", "[amount]", current.ToString()));
+                        line2 = TextManager.GetWithVariables("statusmonitor.junctionload.tooltip",
+                                ("[amount]", load.ToString()),
+                                ("[load]", load.ToString()));
                     }
 
-                    string line3 = TextManager.GetWithVariable("statusmonitor.durability.tooltip", "[amount]", durability.ToString());
+                    LocalizedString line3 = TextManager.GetWithVariable("statusmonitor.durability.tooltip", "[amount]", durability.ToString());
                     SetTooltip(component.Rect.Center, it.Prefab.Name, line1, line2,  line3, line3Color: color);
                     color = HoverColor;
                 }
@@ -1154,12 +1162,12 @@ namespace Barotrauma.Items.Components
                     foreach (Vector2 blip in MiniMapBlips)
                     {
                         Vector2 parentSize = miniMapFrame.Rect.Size.ToVector2();
-                        Sprite pingCircle = GUI.Style.PingCircle.Sprite;
+                        Sprite pingCircle = GUIStyle.PingCircle.Value.Sprite;
                         Vector2 targetSize = new Vector2(parentSize.X / 4f);
                         Vector2 spriteScale = targetSize / pingCircle.size;
                         float scale = Math.Min(blipState, maxBlipState / 2f);
                         float alpha = 1.0f - Math.Clamp((blipState - maxBlipState * 0.25f) * 2f, 0f, 1f);
-                        pingCircle.Draw(spriteBatch, electricalFrame.Rect.Location.ToVector2() + blip * Zoom, GUI.Style.Red * alpha, pingCircle.Origin, 0f, spriteScale * scale, SpriteEffects.None);
+                        pingCircle.Draw(spriteBatch, electricalFrame.Rect.Location.ToVector2() + blip * Zoom, GUIStyle.Red * alpha, pingCircle.Origin, 0f, spriteScale * scale, SpriteEffects.None);
                     }
                 }
             }
@@ -1199,7 +1207,7 @@ namespace Barotrauma.Items.Components
 
                         if (hullsVisible && hullData.HullOxygenAmount is { } oxygenAmount)
                         {
-                            GUI.DrawRectangle(spriteBatch, hullFrame.Rect, Color.Lerp(GUI.Style.Red * 0.5f, GUI.Style.Green * 0.3f, oxygenAmount / 100.0f), true);
+                            GUI.DrawRectangle(spriteBatch, hullFrame.Rect, Color.Lerp(GUIStyle.Red * 0.5f, GUIStyle.Green * 0.3f, oxygenAmount / 100.0f), true);
                         }
                     }
                 }
@@ -1210,8 +1218,9 @@ namespace Barotrauma.Items.Components
             spriteBatch.Begin(SpriteSortMode.Deferred, samplerState: GUI.SamplerState, rasterizerState: GameMain.ScissorTestEnable);
         }
 
-        private void SetTooltip(Point pos, string header, string line1, string line2, string line3, Color? line1Color = null, Color? line2Color = null, Color? line3Color = null)
+        private void SetTooltip(Point pos, LocalizedString header, LocalizedString line1, LocalizedString line2, LocalizedString line3, Color? line1Color = null, Color? line2Color = null, Color? line3Color = null)
         {
+            if (hullInfoFrame == null) { return; }
             hullInfoFrame.RectTransform.ScreenSpaceOffset = pos;
 
             if (hullInfoFrame.Rect.Left > submarineContainer.Rect.Right) { hullInfoFrame.RectTransform.ScreenSpaceOffset = new Point(submarineContainer.Rect.Right, hullInfoFrame.RectTransform.ScreenSpaceOffset.Y); }
@@ -1224,13 +1233,13 @@ namespace Barotrauma.Items.Components
             tooltipHeader.Text = header;
 
             tooltipFirstLine.Text = line1;
-            tooltipFirstLine.TextColor = line1Color ?? GUI.Style.TextColor;
+            tooltipFirstLine.TextColor = line1Color ?? GUIStyle.TextColorNormal;
 
             tooltipSecondLine.Text = line2;
-            tooltipSecondLine.TextColor = line2Color ?? GUI.Style.TextColor;
+            tooltipSecondLine.TextColor = line2Color ?? GUIStyle.TextColorNormal;
 
             tooltipThirdLine.Text = line3;
-            tooltipThirdLine.TextColor = line3Color ?? GUI.Style.TextColor;
+            tooltipThirdLine.TextColor = line3Color ?? GUIStyle.TextColorNormal;
         }
 
         private void BakeSubmarine(Submarine sub, Rectangle container)
@@ -1355,9 +1364,9 @@ namespace Barotrauma.Items.Components
 
             if (GameMain.GameSession?.CrewManager is { ActiveOrders: { } orders })
             {
-                foreach (var pair in orders)
+                foreach (var activeOrder in orders)
                 {
-                    Order order = pair.First;
+                    Order order = activeOrder.Order;
                     if (order is { SymbolSprite: { }, TargetEntity: Hull _ } && order.TargetEntity == hull)
                     {
                         cardsToDraw.Add(new MiniMapSprite(order));
@@ -1367,7 +1376,7 @@ namespace Barotrauma.Items.Components
 
             foreach (IdCard card in data.Cards)
             {
-                if (card.GetJob() is { Icon: { }} job)
+                if (card.OwnerJob is { Icon: { }} job)
                 {
                     cardsToDraw.Add(new MiniMapSprite(job));
                 }
@@ -1415,17 +1424,17 @@ namespace Barotrauma.Items.Components
                     if (amountLeft > 0)
                     {
                         string text = $"+{amountLeft}"; // TODO localization
-                        var (sizeX, sizeY) = GUI.SubHeadingFont.MeasureString(text); // TODO expensive, move to a global variable
+                        var (sizeX, sizeY) = GUIStyle.SubHeadingFont.MeasureString(text); // TODO expensive, move to a global variable
                         float maxWidth = Math.Max(sizeX, sizeY);
                         Vector2 drawPos = new Vector2(frame.Rect.Right - sizeX, frame.Rect.Y - sizeY / 2f);
 
-                        UISprite icon = GUI.Style.IconOverflowIndicator;
+                        UISprite icon = GUIStyle.IconOverflowIndicator;
                         if (icon != null)
                         {
                             const int iconPadding = 4;
-                            icon.Draw(spriteBatch, new Rectangle((int) drawPos.X - iconPadding, (int) drawPos.Y - iconPadding, (int) maxWidth + iconPadding * 2, (int) maxWidth + iconPadding * 2), Color.White, SpriteEffects.None);
+                            icon.Draw(spriteBatch, new Rectangle((int)drawPos.X - iconPadding, (int)drawPos.Y - iconPadding, (int)maxWidth + iconPadding * 2, (int)maxWidth + iconPadding * 2), Color.White, SpriteEffects.None);
                         }
-                        GUI.DrawString(spriteBatch, drawPos, text, GUI.Style.TextColor, font: GUI.SubHeadingFont);
+                        GUI.DrawString(spriteBatch, drawPos, text, GUIStyle.TextColorNormal, font: GUIStyle.SubHeadingFont);
                     }
                     break;
                 }
@@ -1485,7 +1494,7 @@ namespace Barotrauma.Items.Components
 
             if (settings.CreateHullElements)
             {
-                hullList = Hull.hullList.Where(IsPartofSub).ToImmutableArray();
+                hullList = Hull.HullList.Where(IsPartofSub).ToImmutableArray();
                 combinedHulls = CombinedHulls(hullList);
             }
 

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Pump.cs

@@ -19,9 +19,9 @@ namespace Barotrauma.Items.Components
         private readonly List<(Vector2 position, ParticleEmitter emitter)> pumpOutEmitters = new List<(Vector2 position, ParticleEmitter emitter)>(); 
         private readonly List<(Vector2 position, ParticleEmitter emitter)> pumpInEmitters = new List<(Vector2 position, ParticleEmitter emitter)>();
 
-        partial void InitProjSpecific(XElement element)
+        partial void InitProjSpecific(ContentXElement element)
         {
-            foreach (XElement subElement in element.Elements())
+            foreach (var subElement in element.Elements())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
                 {
@@ -47,12 +47,12 @@ namespace Barotrauma.Items.Components
             var paddedPowerArea = new GUIFrame(new RectTransform(new Vector2(0.9f, 0.8f), powerArea.RectTransform, Anchor.Center), style: "PowerButtonFrame");
             var powerLightArea = new GUIFrame(new RectTransform(new Vector2(0.87f, 0.2f), powerArea.RectTransform, Anchor.TopRight), style: null);
             powerLight = new GUITickBox(new RectTransform(Vector2.One, powerLightArea.RectTransform, Anchor.Center),
-                TextManager.Get("PowerLabel"), font: GUI.SubHeadingFont, style: "IndicatorLightPower")
+                TextManager.Get("PowerLabel"), font: GUIStyle.SubHeadingFont, style: "IndicatorLightPower")
             {
                 CanBeFocused = false
             };
             powerLight.TextBlock.AutoScaleHorizontal = true;
-            powerLight.TextBlock.OverrideTextColor(GUI.Style.TextColor);
+            powerLight.TextBlock.OverrideTextColor(GUIStyle.TextColorNormal);
             PowerButton = new GUIButton(new RectTransform(new Vector2(0.8f, 0.75f), paddedPowerArea.RectTransform, Anchor.TopCenter)
             {
                 RelativeOffset = new Vector2(0, 0.1f)
@@ -75,23 +75,23 @@ namespace Barotrauma.Items.Components
             var rightArea = new GUIFrame(new RectTransform(new Vector2(0.65f, 1), paddedFrame.RectTransform, Anchor.CenterRight), style: null);
             
             autoControlIndicator = new GUITickBox(new RectTransform(new Vector2(1.0f, 0.25f), rightArea.RectTransform, Anchor.TopLeft), 
-                TextManager.Get("PumpAutoControl", fallBackTag: "ReactorAutoControl"), font: GUI.SubHeadingFont, style: "IndicatorLightYellow")
+                TextManager.Get("PumpAutoControl", "ReactorAutoControl"), font: GUIStyle.SubHeadingFont, style: "IndicatorLightYellow")
             {
                 Selected = false,
                 Enabled = false,
                 ToolTip = TextManager.Get("AutoControlTip")
             };
             autoControlIndicator.TextBlock.AutoScaleHorizontal = true;
-            autoControlIndicator.TextBlock.OverrideTextColor(GUI.Style.TextColor);
+            autoControlIndicator.TextBlock.OverrideTextColor(GUIStyle.TextColorNormal);
 
             var sliderArea = new GUIFrame(new RectTransform(new Vector2(1, 0.65f), rightArea.RectTransform, Anchor.BottomLeft), style: null);
             var pumpSpeedText = new GUITextBlock(new RectTransform(new Vector2(1, 0.3f), sliderArea.RectTransform, Anchor.TopLeft), "", 
-                textColor: GUI.Style.TextColor, textAlignment: Alignment.CenterLeft, wrap: false, font: GUI.SubHeadingFont)
+                textColor: GUIStyle.TextColorNormal, textAlignment: Alignment.CenterLeft, wrap: false, font: GUIStyle.SubHeadingFont)
             {
                 AutoScaleHorizontal = true
             };
-            string pumpSpeedStr = TextManager.Get("PumpSpeed");
-            pumpSpeedText.TextGetter = () => { return TextManager.AddPunctuation(':', pumpSpeedStr, (int)flowPercentage + " %"); };
+            LocalizedString pumpSpeedStr = TextManager.Get("PumpSpeed");
+            pumpSpeedText.TextGetter = () => { return TextManager.AddPunctuation(':', pumpSpeedStr, (int)Math.Round(flowPercentage) + " %"); };
             pumpSpeedSlider = new GUIScrollBar(new RectTransform(new Vector2(1, 0.35f), sliderArea.RectTransform, Anchor.Center), barSize: 0.1f, style: "DeviceSlider")
             {
                 Step = 0.05f,
@@ -116,9 +116,9 @@ namespace Barotrauma.Items.Components
             };
             var textsArea = new GUIFrame(new RectTransform(new Vector2(1, 0.25f), sliderArea.RectTransform, Anchor.BottomCenter), style: null);
             var outLabel = new GUITextBlock(new RectTransform(new Vector2(0.5f, 1.0f), textsArea.RectTransform, Anchor.CenterLeft), TextManager.Get("PumpOut"), 
-                textColor: GUI.Style.TextColor, textAlignment: Alignment.CenterLeft, wrap: false, font: GUI.SubHeadingFont);
+                textColor: GUIStyle.TextColorNormal, textAlignment: Alignment.CenterLeft, wrap: false, font: GUIStyle.SubHeadingFont);
             var inLabel = new GUITextBlock(new RectTransform(new Vector2(0.5f, 1.0f), textsArea.RectTransform, Anchor.CenterRight), TextManager.Get("PumpIn"), 
-                textColor: GUI.Style.TextColor, textAlignment: Alignment.CenterRight, wrap: false, font: GUI.SubHeadingFont);
+                textColor: GUIStyle.TextColorNormal, textAlignment: Alignment.CenterRight, wrap: false, font: GUIStyle.SubHeadingFont);
             GUITextBlock.AutoScaleAndNormalize(outLabel, inLabel);
         }
 

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Reactor.cs

@@ -63,7 +63,7 @@ namespace Barotrauma.Items.Components
             "ReactorWarningOverheating", "ReactorWarningHighOutput", "ReactorWarningFuelOut", "ReactorWarningSCRAM"
         };
 
-        partial void InitProjSpecific(XElement element)
+        partial void InitProjSpecific(ContentXElement element)
         {
             // TODO: need to recreate the gui when the resolution changes
 
@@ -115,7 +115,7 @@ namespace Barotrauma.Items.Components
             };
 
             /*new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), inventoryContent.RectTransform), "", 
-                textAlignment: Alignment.Center, font: GUI.SubHeadingFont, wrap: true);*/
+                textAlignment: Alignment.Center, font: GUIStyle.SubHeadingFont, wrap: true);*/
             inventoryContainer = new GUIFrame(new RectTransform(new Vector2(1.0f, 0.9f), inventoryContent.RectTransform), style: null);
 
             //----------------------------------------------------------
@@ -131,28 +131,28 @@ namespace Barotrauma.Items.Components
 
             Point maxIndicatorSize = new Point(int.MaxValue, (int)(40 * GUI.Scale));
             criticalHeatWarning = new GUITickBox(new RectTransform(new Vector2(0.3f, 1.0f), topLeftArea.RectTransform) { MaxSize = maxIndicatorSize },
-                TextManager.Get("ReactorWarningCriticalTemp"), font: GUI.SubHeadingFont, style: "IndicatorLightRed")
+                TextManager.Get("ReactorWarningCriticalTemp"), font: GUIStyle.SubHeadingFont, style: "IndicatorLightRed")
             {
                 Selected = false,
                 Enabled = false,
                 ToolTip = TextManager.Get("ReactorHeatTip")
             };
             criticalOutputWarning = new GUITickBox(new RectTransform(new Vector2(0.3f, 1.0f), topLeftArea.RectTransform) { MaxSize = maxIndicatorSize },
-                TextManager.Get("ReactorWarningCriticalOutput"), font: GUI.SubHeadingFont, style: "IndicatorLightRed")
+                TextManager.Get("ReactorWarningCriticalOutput"), font: GUIStyle.SubHeadingFont, style: "IndicatorLightRed")
             {
                 Selected = false,
                 Enabled = false,
                 ToolTip = TextManager.Get("ReactorOutputTip")
             };
             lowTemperatureWarning = new GUITickBox(new RectTransform(new Vector2(0.4f, 1.0f), topLeftArea.RectTransform) { MaxSize = maxIndicatorSize },
-                TextManager.Get("ReactorWarningCriticalLowTemp"), font: GUI.SubHeadingFont, style: "IndicatorLightRed")
+                TextManager.Get("ReactorWarningCriticalLowTemp"), font: GUIStyle.SubHeadingFont, style: "IndicatorLightRed")
             {
                 Selected = false,
                 Enabled = false,
                 ToolTip = TextManager.Get("ReactorTempTip")
             };
             List<GUITickBox> indicatorLights = new List<GUITickBox>() { criticalHeatWarning, lowTemperatureWarning, criticalOutputWarning };
-            indicatorLights.ForEach(l => l.TextBlock.OverrideTextColor(GUI.Style.TextColor));
+            indicatorLights.ForEach(l => l.TextBlock.OverrideTextColor(GUIStyle.TextColorNormal));
             topLeftArea.Recalculate();
 
             new GUIFrame(new RectTransform(new Vector2(1.0f, 0.01f), columnLeft.RectTransform), style: "HorizontalLine");
@@ -167,7 +167,7 @@ namespace Barotrauma.Items.Components
             var rightArea = new GUIFrame(new RectTransform(new Vector2(0.49f, 1), meterArea.RectTransform, Anchor.TopCenter, Pivot.TopLeft), style: null);
 
             var fissionRateTextBox = new GUITextBlock(new RectTransform(relativeTextSize, leftArea.RectTransform, Anchor.TopCenter),
-                TextManager.Get("ReactorFissionRate"), textColor: GUI.Style.TextColor, textAlignment: Alignment.Center, font: GUI.SubHeadingFont)
+                TextManager.Get("ReactorFissionRate"), textColor: GUIStyle.TextColorNormal, textAlignment: Alignment.Center, font: GUIStyle.SubHeadingFont)
             {
                 AutoScaleHorizontal = true
             };
@@ -181,7 +181,7 @@ namespace Barotrauma.Items.Components
             };
 
             var turbineOutputTextBox = new GUITextBlock(new RectTransform(relativeTextSize, rightArea.RectTransform, Anchor.TopCenter), 
-                TextManager.Get("ReactorTurbineOutput"), textColor: GUI.Style.TextColor, textAlignment: Alignment.Center, font: GUI.SubHeadingFont)
+                TextManager.Get("ReactorTurbineOutput"), textColor: GUIStyle.TextColorNormal, textAlignment: Alignment.Center, font: GUIStyle.SubHeadingFont)
             {
                 AutoScaleHorizontal = true
             };
@@ -254,7 +254,7 @@ namespace Barotrauma.Items.Components
                 var b = new GUIButton(new RectTransform(Vector2.One, (i < 4) ? upperButtons.RectTransform : lowerButtons.RectTransform), 
                     TextManager.Get(text), style: "IndicatorButton")
                 {
-                    Font = GUI.SubHeadingFont,
+                    Font = GUIStyle.SubHeadingFont,
                     CanBeFocused = false
                 };
                 warningButtons.Add(text, b);
@@ -298,14 +298,14 @@ namespace Barotrauma.Items.Components
             AutoTempSwitch.RectTransform.MaxSize = new Point((int)(AutoTempSwitch.Rect.Height * 0.4f), int.MaxValue);
             
             autoTempLight = new GUITickBox(new RectTransform(new Vector2(0.4f, 1.0f), topRightArea.RectTransform),
-                TextManager.Get("ReactorAutoTemp"), font: GUI.SubHeadingFont, style: "IndicatorLightYellow")
+                TextManager.Get("ReactorAutoTemp"), font: GUIStyle.SubHeadingFont, style: "IndicatorLightYellow")
                 {
                     ToolTip = TextManager.Get("ReactorTipAutoTemp"),
                     CanBeFocused = false,
                     Selected = AutoTemp
                 };
             autoTempLight.RectTransform.MaxSize = new Point(int.MaxValue, criticalHeatWarning.Rect.Height);
-            autoTempLight.TextBlock.OverrideTextColor(GUI.Style.TextColor);
+            autoTempLight.TextBlock.OverrideTextColor(GUIStyle.TextColorNormal);
 
             new GUIFrame(new RectTransform(new Vector2(0.01f, 1.0f), topRightArea.RectTransform), style: "VerticalLine");
 
@@ -313,14 +313,14 @@ namespace Barotrauma.Items.Components
             var powerArea = new GUIFrame(new RectTransform(new Vector2(0.4f, 1.0f), topRightArea.RectTransform), style: null);
             var paddedPowerArea = new GUIFrame(new RectTransform(new Vector2(0.9f, 0.9f), powerArea.RectTransform, Anchor.Center, scaleBasis: ScaleBasis.BothHeight), style: "PowerButtonFrame");
             powerLight = new GUITickBox(new RectTransform(new Vector2(0.87f, 0.3f), paddedPowerArea.RectTransform, Anchor.TopCenter, Pivot.Center), 
-                TextManager.Get("PowerLabel"), font: GUI.SubHeadingFont, style: "IndicatorLightPower")
+                TextManager.Get("PowerLabel"), font: GUIStyle.SubHeadingFont, style: "IndicatorLightPower")
                 {
                     CanBeFocused = false,
                     Selected = _powerOn
                 };
             powerLight.TextBlock.Padding = new Vector4(5.0f, 0.0f, 0.0f, 0.0f);
             powerLight.TextBlock.AutoScaleHorizontal = true;
-            powerLight.TextBlock.OverrideTextColor(GUI.Style.TextColor);
+            powerLight.TextBlock.OverrideTextColor(GUIStyle.TextColorNormal);
             PowerButton = new GUIButton(new RectTransform(new Vector2(0.8f, 0.75f), paddedPowerArea.RectTransform, Anchor.BottomCenter)
             {
                 RelativeOffset = new Vector2(0, 0.1f)
@@ -337,7 +337,7 @@ namespace Barotrauma.Items.Components
 
             topRightArea.Recalculate();
             autoTempLight.TextBlock.Padding = new Vector4(autoTempLight.TextBlock.Padding.X, 0.0f, 0.0f, 0.0f);
-            autoTempLight.TextBlock.Text = autoTempLight.TextBlock.Text.Replace(' ', '\n');
+            autoTempLight.TextBlock.Text = autoTempLight.TextBlock.Text.Replace(" ", "\n");
             autoTempLight.TextBlock.AutoScaleHorizontal = true;
             GUITextBlock.AutoScaleAndNormalize(indicatorLights.Select(l => l.TextBlock));
 
@@ -364,23 +364,23 @@ namespace Barotrauma.Items.Components
 
             relativeTextSize = new Vector2(1.0f, 0.15f);
             var loadText = new GUITextBlock(new RectTransform(relativeTextSize, graphArea.RectTransform),
-                "Load", textColor: loadColor, font: GUI.SubHeadingFont, textAlignment: Alignment.CenterLeft)
+                "Load", textColor: loadColor, font: GUIStyle.SubHeadingFont, textAlignment: Alignment.CenterLeft)
             {
                 ToolTip = TextManager.Get("ReactorTipLoad")
             };
-            string loadStr = TextManager.Get("ReactorLoad");
-            string kW = TextManager.Get("kilowatt");
+            LocalizedString loadStr = TextManager.Get("ReactorLoad");
+            LocalizedString kW = TextManager.Get("kilowatt");
             loadText.TextGetter += () => $"{loadStr.Replace("[kw]", ((int)Load).ToString())} {kW}";
-            
+
             var graph = new GUIFrame(new RectTransform(new Vector2(1.0f, 0.9f), graphArea.RectTransform), style: "InnerFrameRed");
             new GUICustomComponent(new RectTransform(new Vector2(0.9f, 0.98f), graph.RectTransform, Anchor.Center), DrawGraph, null);
 
             var outputText = new GUITextBlock(new RectTransform(relativeTextSize, graphArea.RectTransform),
-                "Output", textColor: outputColor, font: GUI.SubHeadingFont, textAlignment: Alignment.CenterLeft)
+                "Output", textColor: outputColor, font: GUIStyle.SubHeadingFont, textAlignment: Alignment.CenterLeft)
             {
                 ToolTip = TextManager.Get("ReactorTipPower")
             };
-            string outputStr = TextManager.Get("ReactorOutput");
+            LocalizedString outputStr = TextManager.Get("ReactorOutput");
             outputText.TextGetter += () => $"{outputStr.Replace("[kw]", ((int)-currPowerConsumption).ToString())} {kW}";
         }
 
@@ -610,7 +610,7 @@ namespace Barotrauma.Items.Components
 
             if (optimalRangeNormalized.X == optimalRangeNormalized.Y)
             {
-                sectorSprite.Draw(spriteBatch, pointerPos, GUI.Style.Red, MathHelper.PiOver2, scale);
+                sectorSprite.Draw(spriteBatch, pointerPos, GUIStyle.Red, MathHelper.PiOver2, scale);
             }
             else
             {

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Sonar.cs

@@ -56,7 +56,7 @@ namespace Barotrauma.Items.Components
         private Sprite sonarBlip;
         private Sprite lineSprite;
 
-        private readonly Dictionary<string, Tuple<Sprite, Color>> targetIcons = new Dictionary<string, Tuple<Sprite, Color>>();
+        private readonly Dictionary<Identifier, Tuple<Sprite, Color>> targetIcons = new Dictionary<Identifier, Tuple<Sprite, Color>>();
 
         private float displayBorderSize;
 
@@ -130,10 +130,10 @@ namespace Barotrauma.Items.Components
 
         private bool isConnectedToSteering;
 
-        private static string caveLabel;
+        private static LocalizedString caveLabel;
 
 
-        [Serialize(false, false)]
+        [Serialize(false, IsPropertySaveable.Yes)]
         public bool RightLayout
         {
             get;
@@ -143,16 +143,16 @@ namespace Barotrauma.Items.Components
         private bool AllowUsingMineralScanner =>
             HasMineralScanner && !isConnectedToSteering;
 
-        partial void InitProjSpecific(XElement element)
+        partial void InitProjSpecific(ContentXElement element)
         {
             System.Diagnostics.Debug.Assert(Enum.GetValues(typeof(BlipType)).Cast<BlipType>().All(t => blipColorGradient.ContainsKey(t)));
             sonarBlips = new List<SonarBlip>();
 
-            caveLabel = 
-                TextManager.Get("cave", returnNull: true) ?? 
-                TextManager.Get("missiontype.nest");
+            caveLabel =
+                TextManager.Get("cave").Fallback( 
+                TextManager.Get("missiontype.nest"));
 
-            foreach (XElement subElement in element.Elements())
+            foreach (var subElement in element.Elements())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
                 {
@@ -185,7 +185,7 @@ namespace Barotrauma.Items.Components
                     case "icon":
                         var targetIconSprite = new Sprite(subElement);
                         var color = subElement.GetAttributeColor("color", Color.White);
-                        targetIcons.Add(subElement.GetAttributeString("identifier", ""),
+                        targetIcons.Add(subElement.GetAttributeIdentifier("identifier", Identifier.Empty),
                             new Tuple<Sprite, Color>(targetIconSprite, color));
                         break;
                 }
@@ -238,21 +238,21 @@ namespace Barotrauma.Items.Components
                 RelativeOffset = new Vector2(SonarModeSwitch.RectTransform.RelativeSize.X, 0)
             }, style: null);
             passiveTickBox = new GUITickBox(new RectTransform(new Vector2(1, 0.45f), sonarModeRightSide.RectTransform, Anchor.TopLeft),
-                TextManager.Get("SonarPassive"), font: GUI.SubHeadingFont, style: "IndicatorLightRedSmall")
+                TextManager.Get("SonarPassive"), font: GUIStyle.SubHeadingFont, style: "IndicatorLightRedSmall")
             {
                 ToolTip = TextManager.Get("SonarTipPassive"),
                 Selected = true,
                 Enabled = false
             };
             activeTickBox = new GUITickBox(new RectTransform(new Vector2(1, 0.45f), sonarModeRightSide.RectTransform, Anchor.BottomLeft),
-                TextManager.Get("SonarActive"), font: GUI.SubHeadingFont, style: "IndicatorLightRedSmall")
+                TextManager.Get("SonarActive"), font: GUIStyle.SubHeadingFont, style: "IndicatorLightRedSmall")
             {
                 ToolTip = TextManager.Get("SonarTipActive"),
                 Selected = false,
                 Enabled = false
             };
-            passiveTickBox.TextBlock.OverrideTextColor(GUI.Style.TextColor);
-            activeTickBox.TextBlock.OverrideTextColor(GUI.Style.TextColor);
+            passiveTickBox.TextBlock.OverrideTextColor(GUIStyle.TextColorNormal);
+            activeTickBox.TextBlock.OverrideTextColor(GUIStyle.TextColorNormal);
 
             textBlocksToScaleAndNormalize.Clear();
             textBlocksToScaleAndNormalize.Add(passiveTickBox.TextBlock);
@@ -261,7 +261,7 @@ namespace Barotrauma.Items.Components
             lowerAreaFrame = new GUIFrame(new RectTransform(new Vector2(1, 0.4f + extraHeight), paddedControlContainer.RectTransform, Anchor.BottomCenter), style: null);
             var zoomContainer = new GUIFrame(new RectTransform(new Vector2(1, 0.45f), lowerAreaFrame.RectTransform, Anchor.TopCenter), style: null);
             var zoomText = new GUITextBlock(new RectTransform(new Vector2(0.3f, 0.6f), zoomContainer.RectTransform, Anchor.CenterLeft),
-                TextManager.Get("SonarZoom"), font: GUI.SubHeadingFont, textAlignment: Alignment.CenterRight);
+                TextManager.Get("SonarZoom"), font: GUIStyle.SubHeadingFont, textAlignment: Alignment.CenterRight);
             textBlocksToScaleAndNormalize.Add(zoomText);
             zoomSlider = new GUIScrollBar(new RectTransform(new Vector2(0.5f, 0.8f), zoomContainer.RectTransform, Anchor.CenterLeft)
             {
@@ -299,7 +299,7 @@ namespace Barotrauma.Items.Components
                 }
             };
             var directionalModeSwitchText = new GUITextBlock(new RectTransform(new Vector2(0.7f, 1), directionalModeFrame.RectTransform, Anchor.CenterRight),
-                TextManager.Get("SonarDirectionalPing"), GUI.Style.TextColor, GUI.SubHeadingFont, Alignment.CenterLeft);
+                TextManager.Get("SonarDirectionalPing"), GUIStyle.TextColorNormal, GUIStyle.SubHeadingFont, Alignment.CenterLeft);
             textBlocksToScaleAndNormalize.Add(directionalModeSwitchText);
 
             if (AllowUsingMineralScanner)
@@ -319,7 +319,7 @@ namespace Barotrauma.Items.Components
                 (spriteBatch, guiCustomComponent) => { DrawSonar(spriteBatch, guiCustomComponent.Rect); }, null);
 
             signalWarningText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.25f), sonarView.RectTransform, Anchor.Center, Pivot.BottomCenter),
-                "", warningColor, GUI.LargeFont, Alignment.Center);
+                "", warningColor, GUIStyle.LargeFont, Alignment.Center);
 
             // Setup layout for nav terminal
             if (isConnectedToSteering || RightLayout)
@@ -421,7 +421,7 @@ namespace Barotrauma.Items.Components
                 }
             };
             var mineralScannerSwitchText = new GUITextBlock(new RectTransform(new Vector2(0.7f, 1), mineralScannerFrame.RectTransform, Anchor.CenterRight),
-                TextManager.Get("SonarMineralScanner"), GUI.Style.TextColor, GUI.SubHeadingFont, Alignment.CenterLeft);
+                TextManager.Get("SonarMineralScanner"), GUIStyle.TextColorNormal, GUIStyle.SubHeadingFont, Alignment.CenterLeft);
             textBlocksToScaleAndNormalize.Add(mineralScannerSwitchText);
         }
 
@@ -570,7 +570,7 @@ namespace Barotrauma.Items.Components
                             {
                                 levelTriggerFlows.Add(trigger, flow);
                             }
-                            if (!string.IsNullOrWhiteSpace(trigger.InfectIdentifier) && 
+                            if (!trigger.InfectIdentifier.IsEmpty && 
                                 Vector2.DistanceSquared(transducerCenter, trigger.WorldPosition) < pingRange / 2 * pingRange / 2)
                             {
                                 ballastFloraSpores.Add(trigger);
@@ -918,12 +918,12 @@ namespace Barotrauma.Items.Components
             foreach (AITarget aiTarget in AITarget.List)
             {
                 if (aiTarget.InDetectable) { continue; }
-                if (string.IsNullOrEmpty(aiTarget.SonarLabel) || aiTarget.SoundRange <= 0.0f) { continue; }
+                if (aiTarget.SonarLabel.IsNullOrEmpty() || aiTarget.SoundRange <= 0.0f) { continue; }
 
                 if (Vector2.DistanceSquared(aiTarget.WorldPosition, transducerCenter) < aiTarget.SoundRange * aiTarget.SoundRange)
                 {
                     DrawMarker(spriteBatch,
-                        aiTarget.SonarLabel,
+                        aiTarget.SonarLabel.Value,
                         aiTarget.SonarIconIdentifier,
                         aiTarget,
                         aiTarget.WorldPosition, transducerCenter,
@@ -937,7 +937,7 @@ namespace Barotrauma.Items.Components
             {
                 DrawMarker(spriteBatch,
                     Level.Loaded.StartLocation.Name,
-                    Level.Loaded.StartOutpost != null ? "outpost" : "location",
+                    (Level.Loaded.StartOutpost != null ? "outpost" : "location").ToIdentifier(),
                     Level.Loaded.StartLocation.Name,
                     Level.Loaded.StartExitPosition, transducerCenter,
                     displayScale, center, DisplayRadius);
@@ -947,7 +947,7 @@ namespace Barotrauma.Items.Components
             {
                 DrawMarker(spriteBatch,
                     Level.Loaded.EndLocation.Name,
-                    Level.Loaded.EndOutpost != null ? "outpost" : "location",
+                    (Level.Loaded.EndOutpost != null ? "outpost" : "location").ToIdentifier(),
                     Level.Loaded.EndLocation.Name,
                     Level.Loaded.EndExitPosition, transducerCenter,
                     displayScale, center, DisplayRadius);
@@ -958,8 +958,8 @@ namespace Barotrauma.Items.Components
                 var cave = Level.Loaded.Caves[i];
                 if (!cave.DisplayOnSonar) { continue; }
                 DrawMarker(spriteBatch,
-                    caveLabel,
-                    "cave",
+                    caveLabel.Value,
+                    "cave".ToIdentifier(),
                     "cave" + i,
                     cave.StartPos.ToVector2(), transducerCenter,
                     displayScale, center, DisplayRadius);
@@ -968,13 +968,13 @@ namespace Barotrauma.Items.Components
             int missionIndex = 0;
             foreach (Mission mission in GameMain.GameSession.Missions)
             {
-                if (!string.IsNullOrWhiteSpace(mission.SonarLabel))
+                if (!mission.SonarLabel.IsNullOrWhiteSpace())
                 {
                     int i = 0;
                     foreach (Vector2 sonarPosition in mission.SonarPositions)
                     {
                         DrawMarker(spriteBatch,
-                            mission.SonarLabel,
+                            mission.SonarLabel.Value,
                             mission.SonarIconIdentifier,
                             "mission" + missionIndex + ":" + i,
                             sonarPosition, transducerCenter,
@@ -995,7 +995,7 @@ namespace Barotrauma.Items.Components
                     var i = unobtainedMinerals.FirstOrDefault();
                     if (i == null) { continue; }
                     DrawMarker(spriteBatch,
-                        i.Name, "mineral", "mineralcluster" + i,
+                        i.Name, "mineral".ToIdentifier(), "mineralcluster" + i,
                         c.center, transducerCenter,
                         displayScale, center, DisplayRadius * 0.95f,
                         onlyShowTextOnMouseOver: true);
@@ -1022,8 +1022,8 @@ namespace Barotrauma.Items.Components
                 }
 
                 DrawMarker(spriteBatch,
-                    sub.Info.DisplayName,
-                    sub.Info.HasTag(SubmarineTag.Shuttle) ? "shuttle" : "submarine",
+                    sub.Info.DisplayName.Value,
+                    (sub.Info.HasTag(SubmarineTag.Shuttle) ? "shuttle" : "submarine").ToIdentifier(),
                     sub,
                     sub.WorldPosition, transducerCenter, 
                     displayScale, center, DisplayRadius * 0.95f);
@@ -1611,7 +1611,7 @@ namespace Barotrauma.Items.Components
             sonarBlip.Draw(spriteBatch, center + pos, color * 0.5f * blip.Alpha, sonarBlip.Origin, 0, scale, SpriteEffects.None, 0);
         }
 
-        private void DrawMarker(SpriteBatch spriteBatch, string label, string iconIdentifier, object targetIdentifier, Vector2 worldPosition, Vector2 transducerPosition, float scale, Vector2 center, float radius,
+        private void DrawMarker(SpriteBatch spriteBatch, string label, Identifier iconIdentifier, object targetIdentifier, Vector2 worldPosition, Vector2 transducerPosition, float scale, Vector2 center, float radius,
             bool onlyShowTextOnMouseOver = false)
         {
             float linearDist = Vector2.Distance(worldPosition, transducerPosition);
@@ -1704,11 +1704,11 @@ namespace Barotrauma.Items.Components
 
             if (alpha <= 0.0f) { return; }
 
-            string wrappedLabel = ToolBox.WrapText(label, 150, GUI.SmallFont);
+            string wrappedLabel = ToolBox.WrapText(label, 150, GUIStyle.SmallFont.Value);
             wrappedLabel += "\n" + ((int)(dist * Physics.DisplayToRealWorldRatio) + " m");
 
             Vector2 labelPos = markerPos;
-            Vector2 textSize = GUI.SmallFont.MeasureString(wrappedLabel);
+            Vector2 textSize = GUIStyle.SmallFont.MeasureString(wrappedLabel);
 
             //flip the text to left side when the marker is on the left side or goes outside the right edge of the interface
             if (GuiFrame != null && (dir.X < 0.0f || labelPos.X + textSize.X + 10 > GuiFrame.Rect.X) && labelPos.X - textSize.X > 0) 
@@ -1720,7 +1720,7 @@ namespace Barotrauma.Items.Components
                 new Vector2(labelPos.X + 10, labelPos.Y),
                 wrappedLabel,
                 Color.LightBlue * textAlpha * alpha, Color.Black * textAlpha * 0.8f * alpha,
-                2, GUI.SmallFont);
+                2, GUIStyle.SmallFont);
         }
 
         protected override void RemoveComponentSpecific()

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Steering.cs

@@ -30,7 +30,7 @@ namespace Barotrauma.Items.Components
         private bool dockingNetworkMessagePending;
 
         private GUIButton dockingButton;
-        private string dockText, undockText;
+        private LocalizedString dockText, undockText;
 
         private GUIComponent steerArea;
 
@@ -38,7 +38,7 @@ namespace Barotrauma.Items.Components
 
         private GUITextBlock tipContainer;
 
-        private string noPowerTip, autoPilotMaintainPosTip, autoPilotLevelStartTip, autoPilotLevelEndTip;
+        private LocalizedString noPowerTip, autoPilotMaintainPosTip, autoPilotLevelStartTip, autoPilotLevelEndTip;
 
         private Sprite maintainPosIndicator, maintainPosOriginIndicator;
         private Sprite steeringIndicator;
@@ -90,9 +90,9 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        partial void InitProjSpecific(XElement element)
+        partial void InitProjSpecific(ContentXElement element)
         {
-            foreach (XElement subElement in element.Elements())
+            foreach (var subElement in element.Elements())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
                 {
@@ -141,26 +141,26 @@ namespace Barotrauma.Items.Components
                 RelativeOffset = new Vector2(steeringModeSwitch.RectTransform.RelativeSize.X, 0)
             }, style: null);
             manualPilotIndicator = new GUITickBox(new RectTransform(new Vector2(1, 0.45f), steeringModeRightSide.RectTransform, Anchor.TopLeft),
-                TextManager.Get("SteeringManual"), font: GUI.SubHeadingFont, style: "IndicatorLightRedSmall")
+                TextManager.Get("SteeringManual"), font: GUIStyle.SubHeadingFont, style: "IndicatorLightRedSmall")
             {
                 Selected = !autoPilot,
                 Enabled = false
             };
             autopilotIndicator = new GUITickBox(new RectTransform(new Vector2(1, 0.45f), steeringModeRightSide.RectTransform, Anchor.BottomLeft),
-                TextManager.Get("SteeringAutoPilot"), font: GUI.SubHeadingFont, style: "IndicatorLightRedSmall")
+                TextManager.Get("SteeringAutoPilot"), font: GUIStyle.SubHeadingFont, style: "IndicatorLightRedSmall")
             {
                 Selected = autoPilot,
                 Enabled = false
             };
-            manualPilotIndicator.TextBlock.OverrideTextColor(GUI.Style.TextColor);
-            autopilotIndicator.TextBlock.OverrideTextColor(GUI.Style.TextColor);
+            manualPilotIndicator.TextBlock.OverrideTextColor(GUIStyle.TextColorNormal);
+            autopilotIndicator.TextBlock.OverrideTextColor(GUIStyle.TextColorNormal);
             GUITextBlock.AutoScaleAndNormalize(manualPilotIndicator.TextBlock, autopilotIndicator.TextBlock);
 
             var autoPilotControls = new GUIFrame(new RectTransform(new Vector2(0.75f, 0.62f), paddedControlContainer.RectTransform, Anchor.BottomCenter), "OutlineFrame");
             var paddedAutoPilotControls = new GUIFrame(new RectTransform(new Vector2(0.92f, 0.88f), autoPilotControls.RectTransform, Anchor.Center), style: null);
 
             maintainPosTickBox = new GUITickBox(new RectTransform(new Vector2(1, 0.333f), paddedAutoPilotControls.RectTransform, Anchor.TopCenter),
-                TextManager.Get("SteeringMaintainPos"), font: GUI.SmallFont, style: "GUIRadioButton")
+                TextManager.Get("SteeringMaintainPos"), font: GUIStyle.SmallFont, style: "GUIRadioButton")
             {
                 Enabled = autoPilot,
                 Selected = maintainPos,
@@ -194,10 +194,10 @@ namespace Barotrauma.Items.Components
                     return true;
                 }
             };
-            int textLimit = (int)(MathHelper.Clamp(25 * GUI.xScale, 15, 35));
+            int textLimit = (int)(paddedAutoPilotControls.Rect.Width * 0.75f);
             levelStartTickBox = new GUITickBox(new RectTransform(new Vector2(1, 0.333f), paddedAutoPilotControls.RectTransform, Anchor.Center),
-                GameMain.GameSession?.StartLocation == null ? "" : ToolBox.LimitString(GameMain.GameSession.StartLocation.Name, textLimit),
-                font: GUI.SmallFont, style: "GUIRadioButton")
+                GameMain.GameSession?.StartLocation == null ? "" : ToolBox.LimitString(GameMain.GameSession.StartLocation.Name, GUIStyle.SmallFont, textLimit),
+                font: GUIStyle.SmallFont, style: "GUIRadioButton")
             {
                 Enabled = autoPilot,
                 Selected = levelStartSelected,
@@ -223,8 +223,8 @@ namespace Barotrauma.Items.Components
             };
 
             levelEndTickBox = new GUITickBox(new RectTransform(new Vector2(1, 0.333f), paddedAutoPilotControls.RectTransform, Anchor.BottomCenter),
-                (GameMain.GameSession?.EndLocation == null || Level.IsLoadedOutpost) ? "" : ToolBox.LimitString(GameMain.GameSession.EndLocation.Name, textLimit),
-                font: GUI.SmallFont, style: "GUIRadioButton")
+                (GameMain.GameSession?.EndLocation == null || Level.IsLoadedOutpost) ? "" : ToolBox.LimitString(GameMain.GameSession.EndLocation.Name, GUIStyle.SmallFont, textLimit),
+                font: GUIStyle.SmallFont, style: "GUIRadioButton")
             {
                 Enabled = autoPilot,
                 Selected = levelEndSelected,
@@ -290,7 +290,7 @@ namespace Barotrauma.Items.Components
                 leftElements.Add(left);
                 centerElements.Add(center);
                 rightElements.Add(right);
-                string leftText = string.Empty, centerText = string.Empty;
+                LocalizedString leftText = string.Empty, centerText = string.Empty;
                 GUITextBlock.TextGetterHandler rightTextGetter = null;
                 switch (i)
                 {
@@ -325,10 +325,10 @@ namespace Barotrauma.Items.Components
                         };
                         break;
                 }
-                new GUITextBlock(new RectTransform(Vector2.One, left.RectTransform), leftText, font: GUI.SubHeadingFont, wrap: leftText.Contains(' '), textAlignment: Alignment.CenterRight);
-                new GUITextBlock(new RectTransform(Vector2.One, center.RectTransform), centerText, font: GUI.Font, textAlignment: Alignment.Center) { Padding = Vector4.Zero };
+                new GUITextBlock(new RectTransform(Vector2.One, left.RectTransform), leftText, font: GUIStyle.SubHeadingFont, wrap: leftText.Contains(" "), textAlignment: Alignment.CenterRight);
+                new GUITextBlock(new RectTransform(Vector2.One, center.RectTransform), centerText, font: GUIStyle.Font, textAlignment: Alignment.Center) { Padding = Vector4.Zero };
                 var digitalFrame = new GUIFrame(new RectTransform(Vector2.One, right.RectTransform), style: "DigitalFrameDark");
-                new GUITextBlock(new RectTransform(Vector2.One * 0.85f, digitalFrame.RectTransform, Anchor.Center), "12345", GUI.Style.TextColorDark, GUI.DigitalFont, Alignment.CenterRight)
+                new GUITextBlock(new RectTransform(Vector2.One * 0.85f, digitalFrame.RectTransform, Anchor.Center), "12345", GUIStyle.TextColorDark, GUIStyle.DigitalFont, Alignment.CenterRight)
                 {
                     TextGetter = rightTextGetter
                 };
@@ -345,8 +345,8 @@ namespace Barotrauma.Items.Components
                 RelativeOffset = new Vector2(Sonar.controlBoxOffset.X + 0.05f, -0.05f)
             }, style: null);
 
-            dockText = TextManager.Get("label.navterminaldock", fallBackTag: "captain.dock");
-            undockText = TextManager.Get("label.navterminalundock", fallBackTag: "captain.undock");
+            dockText = TextManager.Get("label.navterminaldock", "captain.dock");
+            undockText = TextManager.Get("label.navterminalundock", "captain.undock");
             dockingButton = new GUIButton(new RectTransform(new Vector2(elementScale), dockingContainer.RectTransform, Anchor.Center), dockText, style: "PowerButton")
             {
                 OnClicked = (btn, userdata) =>
@@ -376,13 +376,13 @@ namespace Barotrauma.Items.Components
                                 enterOutpostPrompt = new GUIMessageBox(
                                     TextManager.GetWithVariable("enterlocation", "[locationname]", DockingTarget.Item.Submarine.Info.Name),
                                     TextManager.Get(subsToLeaveBehind.Count == 1 ? "LeaveSubBehind" : "LeaveSubsBehind"),
-                                    new string[] { TextManager.Get("yes"), TextManager.Get("no") });
+                                    new LocalizedString[] { TextManager.Get("yes"), TextManager.Get("no") });
                             }
                             else
                             {
                                 enterOutpostPrompt = new GUIMessageBox("",
                                     TextManager.GetWithVariable("campaignenteroutpostprompt", "[locationname]", DockingTarget.Item.Submarine.Info.Name),
-                                    new string[] { TextManager.Get("yes"), TextManager.Get("no") });
+                                    new LocalizedString[] { TextManager.Get("yes"), TextManager.Get("no") });
                             }
                             enterOutpostPrompt.Buttons[0].OnClicked += (btn, userdata) =>
                             {
@@ -411,11 +411,11 @@ namespace Barotrauma.Items.Components
                     item.CreateClientEvent(this);
                 }
             }
-            dockingButton.Font = GUI.SubHeadingFont;
+            dockingButton.Font = GUIStyle.SubHeadingFont;
             dockingButton.TextBlock.RectTransform.MaxSize = new Point((int)(dockingButton.Rect.Width * 0.7f), int.MaxValue);
             dockingButton.TextBlock.AutoScaleHorizontal = true;
 
-            var style = GUI.Style.GetComponentStyle("DockingButtonUp");
+            var style = GUIStyle.GetComponentStyle("DockingButtonUp");
             Sprite buttonSprite = style.Sprites.FirstOrDefault().Value.FirstOrDefault()?.Sprite;
             Point buttonSize = buttonSprite != null ? buttonSprite.size.ToPoint() : new Point(149, 52);
             Point horizontalButtonSize = buttonSize.Multiply(elementScale * GUI.Scale * dockingButtonSize);
@@ -447,18 +447,18 @@ namespace Barotrauma.Items.Components
             steerRadius = steerArea.Rect.Width / 2;
 
             iceSpireWarningText = new GUITextBlock(new RectTransform(new Vector2(0.5f, 0.25f), steerArea.RectTransform, Anchor.Center, Pivot.TopCenter),
-                TextManager.Get("NavTerminalIceSpireWarning"), GUI.Style.Red, GUI.SubHeadingFont, Alignment.Center, color: Color.Black * 0.8f, wrap: true)
+                TextManager.Get("NavTerminalIceSpireWarning"), GUIStyle.Red, GUIStyle.SubHeadingFont, Alignment.Center, color: Color.Black * 0.8f, wrap: true)
             {
                 Visible = false
             };
             pressureWarningText = new GUITextBlock(new RectTransform(new Vector2(0.5f, 0.25f), steerArea.RectTransform, Anchor.Center, Pivot.TopCenter), 
-                TextManager.Get("SteeringDepthWarning"), GUI.Style.Red, GUI.SubHeadingFont, Alignment.Center, color: Color.Black * 0.8f)
+                TextManager.Get("SteeringDepthWarning"), GUIStyle.Red, GUIStyle.SubHeadingFont, Alignment.Center, color: Color.Black * 0.8f)
             {
                 Visible = false
             };
             // Tooltip/helper text
             tipContainer = new GUITextBlock(new RectTransform(new Vector2(0.5f, 0.1f), steerArea.RectTransform, Anchor.BottomCenter, Pivot.TopCenter)
-                , "", font: GUI.Font, wrap: true, style: "GUIToolTip", textAlignment: Alignment.Center)
+                , "", font: GUIStyle.Font, wrap: true, style: "GUIToolTip", textAlignment: Alignment.Center)
             {
                 AutoScaleHorizontal = true
             };
@@ -524,7 +524,7 @@ namespace Barotrauma.Items.Components
 
                 if (velRect.Contains(PlayerInput.MousePosition))
                 {
-                    GUI.DrawRectangle(spriteBatch, new Rectangle((int)steeringInputPos.X - 4, (int)steeringInputPos.Y - 4, 8, 8), GUI.Style.Red, thickness: 2);
+                    GUI.DrawRectangle(spriteBatch, new Rectangle((int)steeringInputPos.X - 4, (int)steeringInputPos.Y - 4, 8, 8), GUIStyle.Red, thickness: 2);
                 }
             }
             else if (posToMaintain.HasValue && !LevelStartSelected && !LevelEndSelected)
@@ -537,7 +537,7 @@ namespace Barotrauma.Items.Components
                     displayPosToMaintain = displayPosToMaintain.ClampLength(velRect.Width / 2);
                     displayPosToMaintain = steerArea.Rect.Center.ToVector2() + displayPosToMaintain;
 
-                    Color crosshairColor = GUI.Style.Orange * (0.5f + ((float)Math.Sin(Timing.TotalTime * 5.0f) + 1.0f) / 4.0f);
+                    Color crosshairColor = GUIStyle.Orange * (0.5f + ((float)Math.Sin(Timing.TotalTime * 5.0f) + 1.0f) / 4.0f);
                     if (maintainPosIndicator != null)
                     {
                         maintainPosIndicator.Draw(spriteBatch, displayPosToMaintain, crosshairColor, scale: 0.5f * sonar.Zoom);
@@ -551,11 +551,11 @@ namespace Barotrauma.Items.Components
 
                     if (maintainPosOriginIndicator != null)
                     {
-                        maintainPosOriginIndicator.Draw(spriteBatch, steeringOrigin, GUI.Style.Orange, scale: 0.5f * sonar.Zoom);
+                        maintainPosOriginIndicator.Draw(spriteBatch, steeringOrigin, GUIStyle.Orange, scale: 0.5f * sonar.Zoom);
                     }
                     else
                     {
-                        GUI.DrawRectangle(spriteBatch, new Rectangle((int)steeringOrigin.X - 5, (int)steeringOrigin.Y - 5, 10, 10), GUI.Style.Orange);
+                        GUI.DrawRectangle(spriteBatch, new Rectangle((int)steeringOrigin.X - 5, (int)steeringOrigin.Y - 5, 10, 10), GUIStyle.Orange);
                     }
                 }
             }
@@ -596,11 +596,11 @@ namespace Barotrauma.Items.Components
                 pos.Y = -pos.Y;
                 pos += center;
 
-                GUI.DrawRectangle(spriteBatch, new Rectangle((int)pos.X - 3 / 2, (int)pos.Y - 3, 6, 6), (SteeringPath.CurrentNode == wp) ? Color.LightGreen : GUI.Style.Green, false);
+                GUI.DrawRectangle(spriteBatch, new Rectangle((int)pos.X - 3 / 2, (int)pos.Y - 3, 6, 6), (SteeringPath.CurrentNode == wp) ? Color.LightGreen : GUIStyle.Green, false);
 
                 if (prevPos != Vector2.Zero)
                 {
-                    GUI.DrawLine(spriteBatch, pos, prevPos, GUI.Style.Green);
+                    GUI.DrawLine(spriteBatch, pos, prevPos, GUIStyle.Green);
                 }
 
                 prevPos = pos;
@@ -618,14 +618,14 @@ namespace Barotrauma.Items.Components
                 GUI.DrawLine(spriteBatch, 
                     pos1, 
                     pos2,
-                    GUI.Style.Red * 0.6f, width: 3);
+                    GUIStyle.Red * 0.6f, width: 3);
 
                 if (obstacle.Intersection.HasValue)
                 {
                     Vector2 intersectionPos = (obstacle.Intersection.Value - transducerCenter) *displayScale;
                     intersectionPos.Y = -intersectionPos.Y;
                     intersectionPos += center;
-                    GUI.DrawRectangle(spriteBatch, intersectionPos - Vector2.One * 2, Vector2.One * 4, GUI.Style.Red);
+                    GUI.DrawRectangle(spriteBatch, intersectionPos - Vector2.One * 2, Vector2.One * 4, GUIStyle.Red);
                 }
 
                 Vector2 obstacleCenter = (pos1 + pos2) / 2;
@@ -634,7 +634,7 @@ namespace Barotrauma.Items.Components
                     GUI.DrawLine(spriteBatch,
                         obstacleCenter,
                         obstacleCenter + new Vector2(obstacle.AvoidStrength.X, -obstacle.AvoidStrength.Y) * 100,
-                        Color.Lerp(GUI.Style.Green, GUI.Style.Orange, obstacle.Dot), width: 2);
+                        Color.Lerp(GUIStyle.Green, GUIStyle.Orange, obstacle.Dot), width: 2);
                 }
             }
         }
@@ -673,7 +673,7 @@ namespace Barotrauma.Items.Components
                     dockingButton.Text = dockText;
                     if (dockingButton.FlashTimer <= 0.0f)
                     {
-                        dockingButton.Flash(GUI.Style.Blue, 0.5f, useCircularFlash: true);
+                        dockingButton.Flash(GUIStyle.Blue, 0.5f, useCircularFlash: true);
                         dockingButton.Pulsate(Vector2.One, Vector2.One * 1.2f, dockingButton.FlashTimer);
                     }
                 }
@@ -689,7 +689,7 @@ namespace Barotrauma.Items.Components
                 statusContainer.Visible = false;
                 if (dockingButton.FlashTimer <= 0.0f)
                 {
-                    dockingButton.Flash(GUI.Style.Orange, useCircularFlash: true);
+                    dockingButton.Flash(GUIStyle.Orange, useCircularFlash: true);
                     dockingButton.Pulsate(Vector2.One, Vector2.One * 1.2f, dockingButton.FlashTimer);
                 }
             }
@@ -733,7 +733,10 @@ namespace Barotrauma.Items.Components
                 item.Submarine.RealWorldDepth > Level.Loaded.RealWorldCrushDepth - depthEffectThreshold && item.Submarine.RealWorldDepth > item.Submarine.RealWorldCrushDepth - depthEffectThreshold)
             {
                 pressureWarningText.Visible = true;
-                pressureWarningText.Text = item.Submarine.AtDamageDepth ? TextManager.Get("SteeringDepthWarning") : TextManager.Get("SteeringDepthWarningLow").Replace("[crushdepth]", ((int)item.Submarine.RealWorldCrushDepth).ToString());
+                pressureWarningText.Text =
+                    item.Submarine.AtDamageDepth ?
+                    TextManager.Get("SteeringDepthWarning") :
+                    TextManager.GetWithVariable("SteeringDepthWarningLow", "[crushdepth]", ((int)item.Submarine.RealWorldCrushDepth).ToString());
             }
             else
             {

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Power/PowerContainer.cs

@@ -10,10 +10,10 @@ namespace Barotrauma.Items.Components
         private GUIProgressBar chargeIndicator;
         private GUIScrollBar rechargeSpeedSlider;
 
-        [Serialize(0.0f, true)]
+        [Serialize(0.0f, IsPropertySaveable.Yes)]
         public float RechargeWarningIndicatorLow { get; set; }
 
-        [Serialize(0.0f, true)]
+        [Serialize(0.0f, IsPropertySaveable.Yes)]
         public float RechargeWarningIndicatorHigh { get; set; }
 
         public Vector2 DrawSize
@@ -36,17 +36,17 @@ namespace Barotrauma.Items.Components
 
             var rechargeRateContainer = new GUIFrame(new RectTransform(new Vector2(1, 0.4f), upperArea.RectTransform), style: null);
             var rechargeLabel = new GUITextBlock(new RectTransform(new Vector2(0.4f, 0.0f), rechargeRateContainer.RectTransform, Anchor.CenterLeft),
-                TextManager.Get("rechargerate"), textColor: GUI.Style.TextColor, font: GUI.SubHeadingFont, textAlignment: Alignment.CenterLeft);
-            string kW = TextManager.Get("kilowatt");
+                TextManager.Get("rechargerate"), textColor: GUIStyle.TextColorNormal, font: GUIStyle.SubHeadingFont, textAlignment: Alignment.CenterLeft);
+            LocalizedString kW = TextManager.Get("kilowatt");
             var rechargeText = new GUITextBlock(new RectTransform(new Vector2(0.6f, 1), rechargeRateContainer.RectTransform, Anchor.CenterRight),
-                "", textColor: GUI.Style.TextColor, font: GUI.Font, textAlignment: Alignment.CenterRight)
+                "", textColor: GUIStyle.TextColorNormal, font: GUIStyle.Font, textAlignment: Alignment.CenterRight)
             {
                 TextGetter = () => $"{(int)MathF.Round(currPowerConsumption)} {kW} ({(int)MathF.Round(RechargeRatio * 100)} %)"
             };
-            if (rechargeText.TextSize.X > rechargeText.Rect.Width) { rechargeText.Font = GUI.SmallFont; }
+            if (rechargeText.TextSize.X > rechargeText.Rect.Width) { rechargeText.Font = GUIStyle.SmallFont; }
 
             var rechargeSliderContainer = new GUIFrame(new RectTransform(new Vector2(0.9f, 0.4f), upperArea.RectTransform, Anchor.BottomCenter));
-
+            
             if (RechargeWarningIndicatorLow > 0.0f || RechargeWarningIndicatorHigh > 0.0f)
             {
                 var rechargeSliderFill = new GUICustomComponent(new RectTransform(new Vector2(0.95f, 0.9f), rechargeSliderContainer.RectTransform, Anchor.Center), (SpriteBatch sb, GUICustomComponent c) =>
@@ -54,12 +54,12 @@ namespace Barotrauma.Items.Components
                     if (RechargeWarningIndicatorLow > 0.0f)
                     {
                         float warningLow = c.Rect.Width * RechargeWarningIndicatorLow;
-                        GUI.DrawRectangle(sb, new Vector2(c.Rect.X + warningLow, c.Rect.Y), new Vector2(c.Rect.Width - warningLow, c.Rect.Height), GUI.Style.Orange, isFilled: true);
+                        GUI.DrawRectangle(sb, new Vector2(c.Rect.X + warningLow, c.Rect.Y), new Vector2(c.Rect.Width - warningLow, c.Rect.Height), GUIStyle.Orange, isFilled: true);
                     }
                     if (RechargeWarningIndicatorHigh > 0.0f)
                     {
                         float warningHigh = c.Rect.Width * RechargeWarningIndicatorHigh;
-                        GUI.DrawRectangle(sb, new Vector2(c.Rect.X + warningHigh, c.Rect.Y), new Vector2(c.Rect.Width - warningHigh, c.Rect.Height), GUI.Style.Red, isFilled: true);
+                        GUI.DrawRectangle(sb, new Vector2(c.Rect.X + warningHigh, c.Rect.Y), new Vector2(c.Rect.Width - warningHigh, c.Rect.Height), GUIStyle.Red, isFilled: true);
                     }
                 });
             }
@@ -88,17 +88,17 @@ namespace Barotrauma.Items.Components
 
             var chargeTextContainer = new GUIFrame(new RectTransform(new Vector2(1, 0.4f), lowerArea.RectTransform), style: null);
             var chargeLabel = new GUITextBlock(new RectTransform(new Vector2(0.4f, 0.0f), chargeTextContainer.RectTransform, Anchor.CenterLeft),
-                TextManager.Get("charge"), textColor: GUI.Style.TextColor, font: GUI.SubHeadingFont, textAlignment: Alignment.CenterLeft)
+                TextManager.Get("charge"), textColor: GUIStyle.TextColorNormal, font: GUIStyle.SubHeadingFont, textAlignment: Alignment.CenterLeft)
             {
                 ToolTip = TextManager.Get("PowerTransferTipPower")
             };
-            string kWmin = TextManager.Get("kilowattminute");
+            LocalizedString kWmin = TextManager.Get("kilowattminute");
             var chargeText = new GUITextBlock(new RectTransform(new Vector2(0.6f, 1), chargeTextContainer.RectTransform, Anchor.CenterRight), 
-                "", textColor: GUI.Style.TextColor, font: GUI.Font, textAlignment: Alignment.CenterRight)
+                "", textColor: GUIStyle.TextColorNormal, font: GUIStyle.Font, textAlignment: Alignment.CenterRight)
             {
                 TextGetter = () => $"{(int)MathF.Round(charge)}/{(int)capacity} {kWmin} ({(int)MathF.Round(MathUtils.Percentage(charge, capacity))} %)"
             };
-            if (chargeText.TextSize.X > chargeText.Rect.Width) { chargeText.Font = GUI.SmallFont; }
+            if (chargeText.TextSize.X > chargeText.Rect.Width) { chargeText.Font = GUIStyle.SmallFont; }
 
             chargeIndicator = new GUIProgressBar(new RectTransform(new Vector2(1.1f, 0.5f), lowerArea.RectTransform, Anchor.BottomCenter)
             {

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Power/PowerTransfer.cs

@@ -25,25 +25,25 @@ namespace Barotrauma.Items.Components
                 Stretch = true
             };
             powerIndicator = new GUITickBox(new RectTransform(new Vector2(1, 0.33f), lightsArea.RectTransform), 
-                TextManager.Get("PowerTransferPowered"), font: GUI.SubHeadingFont, style: "IndicatorLightGreen")
+                TextManager.Get("PowerTransferPowered"), font: GUIStyle.SubHeadingFont, style: "IndicatorLightGreen")
             {
                 CanBeFocused = false
             };
             highVoltageIndicator = new GUITickBox(new RectTransform(new Vector2(1, 0.33f), lightsArea.RectTransform), 
-                TextManager.Get("PowerTransferHighVoltage"), font: GUI.SubHeadingFont, style: "IndicatorLightRed")
+                TextManager.Get("PowerTransferHighVoltage"), font: GUIStyle.SubHeadingFont, style: "IndicatorLightRed")
             {
                 ToolTip = TextManager.Get("PowerTransferTipOvervoltage"),
                 Enabled = false
             };
             lowVoltageIndicator = new GUITickBox(new RectTransform(new Vector2(1, 0.33f), lightsArea.RectTransform), 
-                TextManager.Get("PowerTransferLowVoltage"), font: GUI.SubHeadingFont, style: "IndicatorLightRed")
+                TextManager.Get("PowerTransferLowVoltage"), font: GUIStyle.SubHeadingFont, style: "IndicatorLightRed")
             {
                 ToolTip = TextManager.Get("PowerTransferTipLowvoltage"),
                 Enabled = false                
             };
-            powerIndicator.TextBlock.OverrideTextColor(GUI.Style.TextColor);
-            highVoltageIndicator.TextBlock.OverrideTextColor(GUI.Style.TextColor);
-            lowVoltageIndicator.TextBlock.OverrideTextColor(GUI.Style.TextColor);
+            powerIndicator.TextBlock.OverrideTextColor(GUIStyle.TextColorNormal);
+            highVoltageIndicator.TextBlock.OverrideTextColor(GUIStyle.TextColorNormal);
+            lowVoltageIndicator.TextBlock.OverrideTextColor(GUIStyle.TextColorNormal);
             GUITextBlock.AutoScaleAndNormalize(powerIndicator.TextBlock, highVoltageIndicator.TextBlock, lowVoltageIndicator.TextBlock);
 
             var textContainer = new GUIFrame(new RectTransform(new Vector2(0.58f, 1.0f), paddedFrame.RectTransform, Anchor.CenterRight), style: null);
@@ -57,26 +57,33 @@ namespace Barotrauma.Items.Components
             };
 
             var powerLabel = new GUITextBlock(new RectTransform(new Vector2(0.4f, 1), upperTextArea.RectTransform),
-                TextManager.Get("PowerTransferPowerLabel"), textColor: GUI.Style.TextColorBright, font: GUI.LargeFont, textAlignment: Alignment.CenterRight)
+                TextManager.Get("PowerTransferPowerLabel"), textColor: GUIStyle.TextColorBright, font: GUIStyle.LargeFont, textAlignment: Alignment.CenterRight)
             {
                 ToolTip = TextManager.Get("PowerTransferTipPower")
             };
             var loadLabel = new GUITextBlock(new RectTransform(new Vector2(0.4f, 1), lowerTextArea.RectTransform),
-                TextManager.Get("PowerTransferLoadLabel"), textColor: GUI.Style.TextColorBright, font: GUI.LargeFont, textAlignment: Alignment.CenterRight)
+                TextManager.Get("PowerTransferLoadLabel"), textColor: GUIStyle.TextColorBright, font: GUIStyle.LargeFont, textAlignment: Alignment.CenterRight)
             {
                 ToolTip = TextManager.Get("PowerTransferTipLoad")
             };
 
             var digitalBackground = new GUIFrame(new RectTransform(new Vector2(0.55f, 0.8f), upperTextArea.RectTransform), style: "DigitalFrameDark");
             var powerText = new GUITextBlock(new RectTransform(new Vector2(0.9f, 0.95f), digitalBackground.RectTransform, Anchor.Center), 
-                "", font: GUI.DigitalFont, textColor: GUI.Style.TextColorDark)
+                "", font: GUIStyle.DigitalFont, textColor: GUIStyle.TextColorDark)
             {
                 TextAlignment = Alignment.CenterRight,
                 ToolTip = TextManager.Get("PowerTransferTipPower"),
-                TextGetter = () => ((int)Math.Round(-currPowerConsumption)).ToString()
+                TextGetter = () => {
+                    float currPower = powerLoad < 0 ? -powerLoad: 0;
+                    if (!(this is RelayComponent) && PowerConnections != null && PowerConnections.Count > 0 && PowerConnections[0].Grid != null)
+                    {
+                        currPower = PowerConnections[0].Grid.Power;
+                    }
+                    return ((int)Math.Round(currPower)).ToString();
+                }
             };
             var kw1 = new GUITextBlock(new RectTransform(new Vector2(0.15f, 0.5f), upperTextArea.RectTransform),
-                TextManager.Get("kilowatt"), textColor: GUI.Style.TextColor, font: GUI.Font)
+                TextManager.Get("kilowatt"), textColor: GUIStyle.TextColorNormal, font: GUIStyle.Font)
             {
                 Padding = Vector4.Zero,
                 TextAlignment = Alignment.BottomCenter
@@ -84,14 +91,26 @@ namespace Barotrauma.Items.Components
 
             digitalBackground = new GUIFrame(new RectTransform(new Vector2(0.55f, 0.8f), lowerTextArea.RectTransform), style: "DigitalFrameDark");
             var loadText = new GUITextBlock(new RectTransform(new Vector2(0.9f, 0.95f), digitalBackground.RectTransform, Anchor.Center), 
-                "", font: GUI.DigitalFont, textColor: GUI.Style.TextColorDark)
+                "", font: GUIStyle.DigitalFont, textColor: GUIStyle.TextColorDark)
             {
                 TextAlignment = Alignment.CenterRight,
                 ToolTip = TextManager.Get("PowerTransferTipLoad"),
-                TextGetter = () => ((int)Math.Round(this is RelayComponent relay ? relay.DisplayLoad : powerLoad)).ToString()
+                TextGetter = () =>
+                {
+                    float load = PowerLoad;
+                    if (this is RelayComponent relay)
+                    {
+                        load = relay.DisplayLoad;
+                    }
+                    else if (load < 0)
+                    {
+                        load = 0;
+                    }
+                    return ((int)Math.Round(load)).ToString();
+                }
             };
             var kw2 = new GUITextBlock(new RectTransform(new Vector2(0.15f, 0.5f), lowerTextArea.RectTransform),
-                TextManager.Get("kilowatt"), textColor: GUI.Style.TextColor, font: GUI.Font)
+                TextManager.Get("kilowatt"), textColor: GUIStyle.TextColorNormal, font: GUIStyle.Font)
             {
                 Padding = Vector4.Zero,
                 TextAlignment = Alignment.BottomCenter
@@ -106,8 +125,8 @@ namespace Barotrauma.Items.Components
         {
             if (GuiFrame == null) return;
 
-            float voltage = powerLoad <= 0.0f ? 1.0f : -currPowerConsumption / powerLoad;
-            powerIndicator.Selected = IsActive && currPowerConsumption < -0.1f;
+            float voltage = (PowerConnections.Count > 0 && PowerConnections[0].Grid != null) ? PowerConnections[0].Grid.Voltage : 0f;
+            powerIndicator.Selected = IsActive && voltage > 0;
             highVoltageIndicator.Selected = Timing.TotalTime % 0.5f < 0.25f && powerIndicator.Selected && voltage > 1.2f;
             lowVoltageIndicator.Selected = Timing.TotalTime % 0.5f < 0.25f && powerIndicator.Selected && voltage < 0.8f;
         }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Power/Powered.cs

@@ -9,14 +9,14 @@ namespace Barotrauma.Items.Components
         private RoundSound powerOnSound;
         private bool powerOnSoundPlayed;
         
-        partial void InitProjectSpecific(XElement element)
+        partial void InitProjectSpecific(ContentXElement element)
         {
-            foreach (XElement subElement in element.Elements())
+            foreach (var subElement in element.Elements())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
                 {
                     case "poweronsound":
-                        powerOnSound = Submarine.LoadRoundSound(subElement, false);
+                        powerOnSound = RoundSound.Load(subElement, false);
                         break;
                 }
             }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Projectile.cs

@@ -115,9 +115,9 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        partial void InitProjSpecific(XElement element)
+        partial void InitProjSpecific(ContentXElement element)
         {
-            foreach (XElement subElement in element.Elements())
+            foreach (var subElement in element.Elements())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
                 {

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Quality.cs

@@ -7,14 +7,14 @@ namespace Barotrauma.Items.Components
 {
     partial class Quality : ItemComponent
     {
-        public override void AddTooltipInfo(ref string name, ref string description)
+        public override void AddTooltipInfo(ref LocalizedString name, ref LocalizedString description)
         {
             foreach (var statValue in statValues)
             {
                 int roundedValue = (int)Math.Round(statValue.Value * qualityLevel * 100);
                 if (roundedValue == 0) { return; }
-                string colorStr = XMLExtensions.ColorToString(GUI.Style.Green);
-                description += $"\n  ‖color:{colorStr}‖{roundedValue.ToString("+0;-#")}%‖color:end‖ {TextManager.Get("qualitystattypenames." + statValue.Key.ToString(), true) ?? statValue.Key.ToString()}";
+                string colorStr = XMLExtensions.ColorToString(GUIStyle.Green);
+                description += $"\n  ‖color:{colorStr}‖{roundedValue.ToString("+0;-#")}%‖color:end‖ {TextManager.Get("qualitystattypenames." + statValue.Key.ToString()).Fallback(statValue.Key.ToString())}";
             }
         }
     }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/RepairTool.cs

@@ -31,9 +31,9 @@ namespace Barotrauma.Items.Components
         private float prevProgressBarState;
         private Item prevProgressBarTarget = null;
 
-        partial void InitProjSpecific(XElement element)
+        partial void InitProjSpecific(ContentXElement element)
         {
-            foreach (XElement subElement in element.Elements())
+            foreach (var subElement in element.Elements())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
                 {
@@ -41,10 +41,10 @@ namespace Barotrauma.Items.Components
                         particleEmitters.Add(new ParticleEmitter(subElement));
                         break;
                     case "particleemitterhititem":
-                        string[] identifiers = subElement.GetAttributeStringArray("identifiers", new string[0]);
-                        if (identifiers.Length == 0) identifiers = subElement.GetAttributeStringArray("identifier", new string[0]);
-                        string[] excludedIdentifiers = subElement.GetAttributeStringArray("excludedidentifiers", new string[0]);
-                        if (excludedIdentifiers.Length == 0) excludedIdentifiers = subElement.GetAttributeStringArray("excludedidentifier", new string[0]);
+                        Identifier[] identifiers = subElement.GetAttributeIdentifierArray("identifiers", Array.Empty<Identifier>());
+                        if (identifiers.Length == 0) { identifiers = subElement.GetAttributeIdentifierArray("identifier", Array.Empty<Identifier>()); }
+                        Identifier[] excludedIdentifiers = subElement.GetAttributeIdentifierArray("excludedidentifiers", Array.Empty<Identifier>());
+                        if (excludedIdentifiers.Length == 0) { excludedIdentifiers = subElement.GetAttributeIdentifierArray("excludedidentifier", Array.Empty<Identifier>()); }
                         
                         particleEmitterHitItem.Add(
                             new Pair<RelatedItem, ParticleEmitter>(
@@ -89,7 +89,7 @@ namespace Barotrauma.Items.Components
                 targetStructure.ID * 1000 + sectionIndex, //unique "identifier" for each wall section
                 progressBarPos,
                 MathUtils.InverseLerp(targetStructure.Prefab.MinHealth, targetStructure.Health, targetStructure.Health - targetStructure.SectionDamage(sectionIndex)),
-                GUI.Style.Red, GUI.Style.Green);
+                GUIStyle.Red, GUIStyle.Green);
 
             if (progressBar != null) progressBar.Size = new Vector2(60.0f, 20.0f);
 
@@ -128,7 +128,7 @@ namespace Barotrauma.Items.Components
                             targetItem,
                             progressBarPos,
                             progressBarState,
-                            GUI.Style.Red, GUI.Style.Green,
+                            GUIStyle.Red, GUIStyle.Green,
                             progressBarState < prevProgressBarState ? "progressbar.cutting" : "");
                         if (progressBar != null) { progressBar.Size = new Vector2(60.0f, 20.0f); }
                     }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Repairable.cs

@@ -29,9 +29,9 @@ namespace Barotrauma.Items.Components
 
         private SoundChannel repairSoundChannel;
 
-        private string repairButtonText, repairingText;
-        private string sabotageButtonText, sabotagingText;
-        private string tinkerButtonText, tinkeringText;
+        private LocalizedString repairButtonText, repairingText;
+        private LocalizedString sabotageButtonText, sabotagingText;
+        private LocalizedString tinkerButtonText, tinkeringText;
 
         private FixActions requestStartFixAction;
 
@@ -44,7 +44,7 @@ namespace Barotrauma.Items.Components
 
         public float FakeBrokenTimer;
 
-        [Serialize("", false, description: "An optional description of the needed repairs displayed in the repair interface.")]
+        [Serialize("", IsPropertySaveable.No, description: "An optional description of the needed repairs displayed in the repair interface.")]
         public string Description
         {
             get;
@@ -78,10 +78,10 @@ namespace Barotrauma.Items.Components
             return false;
         }
 
-        partial void InitProjSpecific(XElement element)
+        partial void InitProjSpecific(ContentXElement element)
         {
             CreateGUI();
-            foreach (XElement subElement in element.Elements())
+            foreach (var subElement in element.Elements())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
                 {
@@ -124,18 +124,18 @@ namespace Barotrauma.Items.Components
             };
             
             new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.15f), paddedFrame.RectTransform),
-                header, textAlignment: Alignment.TopCenter, font: GUI.LargeFont);
+                header, textAlignment: Alignment.TopCenter, font: GUIStyle.LargeFont);
 
             new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedFrame.RectTransform),
-                Description, font: GUI.SmallFont, wrap: true);
+                Description, font: GUIStyle.SmallFont, wrap: true);
 
             new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedFrame.RectTransform),
-                TextManager.Get("RequiredRepairSkills"), font: GUI.SubHeadingFont);
+                TextManager.Get("RequiredRepairSkills"), font: GUIStyle.SubHeadingFont);
             for (int i = 0; i < requiredSkills.Count; i++)
             {
                 var skillText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedFrame.RectTransform),
                     "   - " + TextManager.AddPunctuation(':', TextManager.Get("SkillName." + requiredSkills[i].Identifier), ((int) Math.Round(requiredSkills[i].Level * SkillRequirementMultiplier)).ToString()),
-                    font: GUI.SmallFont)
+                    font: GUIStyle.SmallFont)
                 {
                     UserData = requiredSkills[i]
                 };
@@ -148,9 +148,9 @@ namespace Barotrauma.Items.Components
             };
 
             progressBar = new GUIProgressBar(new RectTransform(new Vector2(0.6f, 1.0f), progressBarHolder.RectTransform),
-                color: GUI.Style.Green, barSize: 0.0f, style: "DeviceProgressBar");
+                color: GUIStyle.Green, barSize: 0.0f, style: "DeviceProgressBar");
 
-            progressBarOverlayText = new GUITextBlock(new RectTransform(Vector2.One, progressBar.RectTransform), string.Empty, font: GUI.SubHeadingFont, textAlignment: Alignment.Center)
+            progressBarOverlayText = new GUITextBlock(new RectTransform(Vector2.One, progressBar.RectTransform), string.Empty, font: GUIStyle.SubHeadingFont, textAlignment: Alignment.Center)
             {
                 IgnoreLayoutGroups = true
             };
@@ -203,8 +203,8 @@ namespace Barotrauma.Items.Components
                 }
             };
 
-            tinkerButtonText = TextManager.Get("TinkerButton", returnNull: true) ?? "Tinker";
-            tinkeringText = TextManager.Get("Tinkering", returnNull: true) ?? "Tinkering";
+            tinkerButtonText = TextManager.Get("TinkerButton").Fallback("Tinker");
+            tinkeringText = TextManager.Get("Tinkering").Fallback("Tinkering");
             TinkerButton = new GUIButton(new RectTransform(Vector2.One, extraButtonContainer.RectTransform), tinkerButtonText, style: "GUIButtonSmall")
             {
                 IgnoreLayoutGroups = true,
@@ -295,24 +295,24 @@ namespace Barotrauma.Items.Components
         public override void DrawHUD(SpriteBatch spriteBatch, Character character)
         {
             IsActive = true;
-
+            
             float defaultMaxCondition = (item.MaxCondition / item.MaxRepairConditionMultiplier);
 
             progressBar.BarSize = item.Condition / defaultMaxCondition;
-            progressBar.Color = ToolBox.GradientLerp(progressBar.BarSize, GUI.Style.Red, GUI.Style.Orange, GUI.Style.Green);
+            progressBar.Color = ToolBox.GradientLerp(progressBar.BarSize, GUIStyle.Red, GUIStyle.Orange, GUIStyle.Green);
 
             Rectangle sliderRect = progressBar.GetSliderRect(1.0f);
             Color qteSliderColor = Color.White;
             if (qteCooldown > 0.0f)
             {
-                qteSliderColor = qteSuccess ? GUI.Style.Green : GUI.Style.Red * 0.5f;
+                qteSliderColor = qteSuccess ? GUIStyle.Green : GUIStyle.Red * 0.5f;
                 progressBar.Color = ToolBox.GradientLerp(qteCooldown / QteCooldownDuration, progressBar.Color, qteSliderColor, Color.White);
             }
             else
             {
                 if (qteTimer / QteDuration <= item.Condition / item.MaxCondition)
                 {
-                    qteSliderColor = Color.Lerp(qteSliderColor, GUI.Style.Green, 0.5f);
+                    qteSliderColor = Color.Lerp(qteSliderColor, GUIStyle.Green, 0.5f);
                 }
             }
 
@@ -324,7 +324,7 @@ namespace Barotrauma.Items.Components
             if (item.Condition > defaultMaxCondition)
             {
                 float extraCondition = item.MaxCondition * (item.MaxRepairConditionMultiplier - 1.0f);
-                progressBar.Color = ToolBox.GradientLerp((item.Condition - defaultMaxCondition) / extraCondition, GUI.Style.ColorReputationHigh, GUI.Style.ColorReputationVeryHigh);
+                progressBar.Color = ToolBox.GradientLerp((item.Condition - defaultMaxCondition) / extraCondition, GUIStyle.ColorReputationHigh, GUIStyle.ColorReputationVeryHigh);
                 progressBarOverlayText.Visible = true;
                 progressBarOverlayText.Text = $"{(int)Math.Round((item.Condition / defaultMaxCondition) * 100)}%";
             }
@@ -364,7 +364,7 @@ namespace Barotrauma.Items.Components
                 GUITextBlock textBlock = (GUITextBlock)c;
                 if (character.GetSkillLevel(skill.Identifier) < (skill.Level * SkillRequirementMultiplier))
                 {
-                    textBlock.TextColor = GUI.Style.Red;
+                    textBlock.TextColor = GUIStyle.Red;
                 }
                 else
                 {
@@ -388,11 +388,11 @@ namespace Barotrauma.Items.Components
                 {
                     GUI.DrawString(spriteBatch,
                         new Vector2(item.DrawPosition.X, -item.DrawPosition.Y), "Deteriorating at " + (int)(DeteriorationSpeed * 60.0f) + " units/min" + (paused ? " [PAUSED]" : ""),
-                        paused ? Color.Cyan : GUI.Style.Red, Color.Black * 0.5f);
+                        paused ? Color.Cyan : GUIStyle.Red, Color.Black * 0.5f);
                 }
                 GUI.DrawString(spriteBatch,
                     new Vector2(item.DrawPosition.X, -item.DrawPosition.Y + 20), "Condition: " + (int)item.Condition + "/" + (int)item.MaxCondition,
-                    GUI.Style.Orange);
+                    GUIStyle.Orange);
             }
         }
 

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Rope.cs

@@ -10,28 +10,28 @@ namespace Barotrauma.Items.Components
     {
         private Sprite sprite, startSprite, endSprite;
 
-        [Serialize(5, false)]
+        [Serialize(5, IsPropertySaveable.No)]
         public int SpriteWidth
         {
             get;
             set;
         }
 
-        [Serialize("255,255,255,255", false)]
+        [Serialize("255,255,255,255", IsPropertySaveable.No)]
         public Color SpriteColor
         {
             get;
             set;
         }
 
-        [Serialize(false, false)]
+        [Serialize(false, IsPropertySaveable.No)]
         public bool Tile
         {
             get;
             set;
         }
 
-        [Serialize("0.5,0.5)", false)]
+        [Serialize("0.5,0.5)", IsPropertySaveable.No)]
         public Vector2 Origin { get; set; } = new Vector2(0.5f, 0.5f);
 
         public Vector2 DrawSize
@@ -62,9 +62,9 @@ namespace Barotrauma.Items.Components
             return sourcePos;
         }
 
-        partial void InitProjSpecific(XElement element)
+        partial void InitProjSpecific(ContentXElement element)
         {
-            foreach (XElement subElement in element.Elements())
+            foreach (var subElement in element.Elements())
             {
                 switch (subElement.Name.ToString().ToLowerInvariant())
                 {

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Scanner.cs

@@ -11,7 +11,7 @@ namespace Barotrauma.Items.Components
                 Character.Controlled?.UpdateHUDProgressBar(this,
                     item.WorldPosition,
                     ScanTimer / ScanDuration,
-                    GUI.Style.Red, GUI.Style.Green,
+                    GUIStyle.Red, GUIStyle.Green,
                     textTag: "progressbar.scanning");
             }
         }

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

@@ -14,7 +14,7 @@ namespace Barotrauma.Items.Components
         private GUIImage containerIndicator;
         private GUIComponentStyle indicatorStyleRed, indicatorStyleGreen;
 
-        partial void InitProjSpecific(XElement element)
+        partial void InitProjSpecific(ContentXElement element)
         {
             terminalButtonStyles = new string[RequiredSignalCount];
             int i = 0;
@@ -24,8 +24,8 @@ namespace Barotrauma.Items.Components
                 if (style == null) { continue; }
                 terminalButtonStyles[i++] = style;
             }
-            indicatorStyleRed = GUI.Style.GetComponentStyle("IndicatorLightRed");
-            indicatorStyleGreen = GUI.Style.GetComponentStyle("IndicatorLightGreen");
+            indicatorStyleRed = GUIStyle.GetComponentStyle("IndicatorLightRed");
+            indicatorStyleGreen = GUIStyle.GetComponentStyle("IndicatorLightGreen");
             CreateGUI();
         }
 

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

@@ -190,7 +190,7 @@ namespace Barotrauma.Items.Components
                 if (wire.HiddenInGame && Screen.Selected == GameMain.GameScreen) { continue; }
 
                 Connection recipient = wire.OtherConnection(null);
-                string label = recipient == null ? "" : recipient.item.Name + $" ({recipient.DisplayName})";
+                LocalizedString label = recipient == null ? "" : recipient.item.Name + $" ({recipient.DisplayName})";
                 if (wire.Locked) { label += "\n" + TextManager.Get("ConnectionLocked"); }
                 DrawWire(spriteBatch, wire, new Vector2(x, y + height - 100 * GUI.Scale),
                     new Vector2(x, y + height),
@@ -208,17 +208,17 @@ namespace Barotrauma.Items.Components
 
         private void DrawConnection(SpriteBatch spriteBatch, ConnectionPanel panel, Vector2 position, Vector2 labelPos, Vector2 scale)
         {
-            string text = DisplayName.ToUpper();
+            string text = DisplayName.Value.ToUpper();
 
             //nasty
-            if (GUI.Style.GetComponentStyle("ConnectionPanelLabel")?.Sprites.Values.First().First() is UISprite labelSprite)
+            if (GUIStyle.GetComponentStyle("ConnectionPanelLabel")?.Sprites.Values.First().First() is UISprite labelSprite)
             {
                 Rectangle labelArea = GetLabelArea(labelPos, text, scale);
-                labelSprite.Draw(spriteBatch, labelArea, IsPower ? GUI.Style.Red : Color.SteelBlue);
+                labelSprite.Draw(spriteBatch, labelArea, IsPower ? GUIStyle.Red : Color.SteelBlue);
             }
 
-            GUI.DrawString(spriteBatch, labelPos + Vector2.UnitY, text, Color.Black * 0.8f, font: GUI.SmallFont);
-            GUI.DrawString(spriteBatch, labelPos, text, GUI.Style.TextColorBright, font: GUI.SmallFont);
+            GUI.DrawString(spriteBatch, labelPos + Vector2.UnitY, text, Color.Black * 0.8f, font: GUIStyle.SmallFont);
+            GUI.DrawString(spriteBatch, labelPos, text, GUIStyle.TextColorBright, font: GUIStyle.SmallFont);
 
             float connectorSpriteScale = (35.0f / connectionSprite.SourceRect.Width) * panel.Scale;
             connectionSprite.Draw(spriteBatch, position, scale: connectorSpriteScale);
@@ -234,7 +234,7 @@ namespace Barotrauma.Items.Components
                 if (wires[i].HiddenInGame && Screen.Selected == GameMain.GameScreen) { continue; }
 
                 Connection recipient = wires[i].OtherConnection(this);
-                string label = recipient == null ? "" : recipient.item.Name + $" ({recipient.DisplayName})";
+                LocalizedString label = recipient == null ? "" : recipient.item.Name + $" ({recipient.DisplayName})";
                 if (wires[i].Locked) { label += "\n" + TextManager.Get("ConnectionLocked"); }
                 DrawWire(spriteBatch, wires[i], position, wirePosition, equippedWire, panel, label);
 
@@ -295,7 +295,7 @@ namespace Barotrauma.Items.Components
         {
             FlashTimer = flashDuration;
             this.flashDuration = flashDuration;
-            flashColor = (color == null) ? GUI.Style.Red : (Color)color;
+            flashColor = (color == null) ? GUIStyle.Red : (Color)color;
         }
 
         public void UpdateFlashTimer(float deltaTime)
@@ -304,7 +304,7 @@ namespace Barotrauma.Items.Components
             FlashTimer -= deltaTime;
         }
 
-        private static void DrawWire(SpriteBatch spriteBatch, Wire wire, Vector2 end, Vector2 start, Wire equippedWire, ConnectionPanel panel, string label)
+        private static void DrawWire(SpriteBatch spriteBatch, Wire wire, Vector2 end, Vector2 start, Wire equippedWire, ConnectionPanel panel, LocalizedString label)
         {
             int textX = (int)start.X;
             if (start.X < end.X)
@@ -324,20 +324,20 @@ namespace Barotrauma.Items.Components
                 Vector2.Distance(end, PlayerInput.MousePosition) < 20.0f ||
                 new Rectangle((start.X < end.X) ? textX - 100 : textX, (int)start.Y - 5, 100, 14).Contains(PlayerInput.MousePosition));
 
-            if (!string.IsNullOrEmpty(label))
+            if (!label.IsNullOrEmpty())
             {
                 if (start.Y > panel.GuiFrame.Rect.Bottom - 1.0f)
                 {
                     //wire at the bottom of the panel -> draw the text below the panel, tilted 45 degrees
-                    GUI.Font.DrawString(spriteBatch, label, start + Vector2.UnitY * 20 * GUI.Scale, Color.White, 45.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.0f);
+                    GUIStyle.Font.DrawString(spriteBatch, label, start + Vector2.UnitY * 20 * GUI.Scale, Color.White, 45.0f, Vector2.Zero, 1.0f, SpriteEffects.None, 0.0f);
                 }
                 else
                 {
                     GUI.DrawString(spriteBatch,
-                        new Vector2(start.X < end.X ? textX - GUI.SmallFont.MeasureString(label).X : textX, start.Y - 5.0f),
+                        new Vector2(start.X < end.X ? textX - GUIStyle.SmallFont.MeasureString(label).X : textX, start.Y - 5.0f),
                         label,
-                        wire.Locked ? GUI.Style.TextColorDim : (mouseOn ? Wire.higlightColor : GUI.Style.TextColor), Color.Black * 0.9f,
-                        3, GUI.SmallFont);
+                        wire.Locked ? GUIStyle.TextColorDim : (mouseOn ? Wire.higlightColor : GUIStyle.TextColorNormal), Color.Black * 0.9f,
+                        3, GUIStyle.SmallFont);
                 }
             }
 
@@ -401,13 +401,13 @@ namespace Barotrauma.Items.Components
                 {
                     if (c.IsOutput)
                     {
-                        var labelArea = GetLabelArea(GetOutputLabelPosition(rightPos, panel, c), c.DisplayName.ToUpper(), scale);
+                        var labelArea = GetLabelArea(GetOutputLabelPosition(rightPos, panel, c), c.DisplayName.Value.ToUpper(), scale);
                         labelAreas.Add(labelArea);
                         rightPos.Y += connectorIntervalLeft;
                     }
                     else
                     {
-                        var labelArea = GetLabelArea(GetInputLabelPosition(leftPos, panel, c), c.DisplayName.ToUpper(), scale);
+                        var labelArea = GetLabelArea(GetInputLabelPosition(leftPos, panel, c), c.DisplayName.Value.ToUpper(), scale);
                         labelAreas.Add(labelArea);
                         leftPos.Y += connectorIntervalRight;
                     }
@@ -455,19 +455,19 @@ namespace Barotrauma.Items.Components
         {
             return new Vector2(
                 connectorPosition.X + 25 * panel.Scale,
-                connectorPosition.Y - 5 * panel.Scale - GUI.SmallFont.MeasureString(connection.DisplayName.ToUpper()).Y);
+                connectorPosition.Y - 5 * panel.Scale - GUIStyle.SmallFont.MeasureString(connection.DisplayName.ToUpper()).Y);
         }
 
         private static Vector2 GetOutputLabelPosition(Vector2 connectorPosition, ConnectionPanel panel, Connection connection)
         {
             return new Vector2(
-                connectorPosition.X - 25 * panel.Scale - GUI.SmallFont.MeasureString(connection.DisplayName.ToUpper()).X,
+                connectorPosition.X - 25 * panel.Scale - GUIStyle.SmallFont.MeasureString(connection.DisplayName.ToUpper()).X,
                 connectorPosition.Y + 5 * panel.Scale);
         }
 
         private static Rectangle GetLabelArea(Vector2 labelPos, string text, Vector2 scale)
         {
-            Vector2 textSize = GUI.SmallFont.MeasureString(text);
+            Vector2 textSize = GUIStyle.SmallFont.MeasureString(text);
             Rectangle labelArea = new Rectangle(labelPos.ToPoint(), textSize.ToPoint());
             labelArea.Inflate(10 * scale.X, 3 * scale.Y);
             return labelArea;

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

@@ -107,7 +107,7 @@ namespace Barotrauma.Items.Components
             HighlightedWire = null;
             Connection.DrawConnections(spriteBatch, this, user);
 
-            foreach (UISprite sprite in GUI.Style.GetComponentStyle("ConnectionPanelFront").Sprites[GUIComponent.ComponentState.None])
+            foreach (UISprite sprite in GUIStyle.GetComponentStyle("ConnectionPanelFront").Sprites[GUIComponent.ComponentState.None])
             {
                 sprite.Draw(spriteBatch, GuiFrame.Rect, Color.White, SpriteEffects.None);
             }

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

@@ -44,7 +44,7 @@ namespace Barotrauma.Items.Components
                         UserData = ciElement
                     };
                     new GUITextBlock(new RectTransform(new Vector2(0.5f, 1.0f), layoutGroup.RectTransform), 
-                        TextManager.Get(ciElement.Label, returnNull: true) ?? ciElement.Label);
+                        TextManager.Get(ciElement.Label).Fallback(ciElement.Label));
                     if (!ciElement.IsIntegerInput)
                     {
                         var textBox = new GUITextBox(new RectTransform(new Vector2(0.5f, 1.0f), layoutGroup.RectTransform), ciElement.Signal, style: "GUITextBoxNoIcon")
@@ -107,7 +107,7 @@ namespace Barotrauma.Items.Components
                     var tickBox = new GUITickBox(new RectTransform(new Vector2(1.0f, elementSize), uiElementContainer.RectTransform)
                     {
                         MaxSize = ElementMaxSize
-                    }, TextManager.Get(ciElement.Label, returnNull: true) ?? ciElement.Label)
+                    }, TextManager.Get(ciElement.Label).Fallback(ciElement.Label))
                     {
                         UserData = ciElement
                     };
@@ -131,7 +131,7 @@ namespace Barotrauma.Items.Components
                 else
                 {
                     var btn = new GUIButton(new RectTransform(new Vector2(1.0f, elementSize), uiElementContainer.RectTransform),
-                        TextManager.Get(ciElement.Label, returnNull: true) ?? ciElement.Label, style: "DeviceButton")
+                        TextManager.Get(ciElement.Label).Fallback(ciElement.Label), style: "DeviceButton")
                     {
                         UserData = ciElement
                     };
@@ -250,7 +250,7 @@ namespace Barotrauma.Items.Components
                 }
             }
 
-            string CreateLabelText(int elementIndex)
+            LocalizedString CreateLabelText(int elementIndex)
             {
                 return string.IsNullOrWhiteSpace(customInterfaceElementList[elementIndex].Label) ?
                     TextManager.GetWithVariable("connection.signaloutx", "[num]", (elementIndex + 1).ToString()) :

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

@@ -90,7 +90,7 @@ namespace Barotrauma.Items.Components
             GUITextBlock newBlock = new GUITextBlock(
                     new RectTransform(new Vector2(1, 0), historyBox.Content.RectTransform, anchor: Anchor.TopCenter),
                     "> " + input,
-                    textColor: color, wrap: true, font: UseMonospaceFont ? GUI.MonospacedFont : GUI.GlobalFont)
+                    textColor: color, wrap: true, font: UseMonospaceFont ? GUIStyle.MonospacedFont : GUIStyle.GlobalFont)
             {
                 CanBeFocused = false
             };

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

@@ -62,7 +62,7 @@ namespace Barotrauma.Items.Components
                 if (width <= 0f) { return; }
                 RecalculateVertices(wire, width);
 
-                for (int i=0;i<vertices.Length;i++)
+                for (int i = 0; i < vertices.Length; i++)
                 {
                     shiftedVertices[i].Color = color;
                     shiftedVertices[i].Position = vertices[i].Position;
@@ -96,7 +96,7 @@ namespace Barotrauma.Items.Components
         private static int? selectedNodeIndex;
         private static int? highlightedNodeIndex;
 
-        [Serialize(0.3f, false)]
+        [Serialize(0.3f, IsPropertySaveable.No)]
         public float Width
         {
             get;
@@ -113,7 +113,7 @@ namespace Barotrauma.Items.Components
             get => draggingWire;
         }
 
-        partial void InitProjSpecific(XElement element)
+        partial void InitProjSpecific(ContentXElement element)
         {
             if (defaultWireSprite == null)
             {
@@ -123,7 +123,7 @@ namespace Barotrauma.Items.Components
                 };
             }
 
-            foreach (XElement subElement in element.Elements())
+            foreach (var subElement in element.Elements())
             {
                 if (subElement.Name.ToString().Equals("wiresprite", StringComparison.OrdinalIgnoreCase))
                 {
@@ -286,7 +286,7 @@ namespace Barotrauma.Items.Components
             WireSection.Draw(
                 spriteBatch, this,
                 start, endPos,
-                GUI.Style.Orange, depth + 0.00001f, 0.2f);
+                GUIStyle.Orange, depth + 0.00001f, 0.2f);
 
             WireSection.Draw(
                 spriteBatch, this,

Barotrauma/BarotraumaClient/ClientSource/Items/Components/StatusHUD.cs

@@ -9,7 +9,7 @@ namespace Barotrauma.Items.Components
 {
     partial class StatusHUD : ItemComponent
     {
-        private static readonly string[] BleedingTexts = 
+        private static readonly LocalizedString[] BleedingTexts = 
         {
             TextManager.Get("MinorBleeding"),
             TextManager.Get("Bleeding"),
@@ -17,7 +17,7 @@ namespace Barotrauma.Items.Components
             TextManager.Get("CatastrophicBleeding")
         };
 
-        private static readonly string[] OxygenTexts = 
+        private static readonly LocalizedString[] OxygenTexts = 
         {
             TextManager.Get("OxygenNormal"),
             TextManager.Get("OxygenReduced"),
@@ -25,42 +25,42 @@ namespace Barotrauma.Items.Components
             TextManager.Get("NotBreathing")
         };
 
-        [Serialize(500.0f, false, description: "How close to a target the user must be to see their health data (in pixels).")]
+        [Serialize(500.0f, IsPropertySaveable.No, description: "How close to a target the user must be to see their health data (in pixels).")]
         public float Range
         {
             get;
             private set;
         }
 
-        [Serialize(50.0f, false, description: "The range within which the health info texts fades out.")]
+        [Serialize(50.0f, IsPropertySaveable.No, description: "The range within which the health info texts fades out.")]
         public float FadeOutRange
         {
             get;
             private set;
         }
 
-        [Serialize(false, false)]
+        [Serialize(false, IsPropertySaveable.No)]
         public bool ThermalGoggles
         {
             get;
             private set;
         }
 
-        [Serialize(true, false)]
+        [Serialize(true, IsPropertySaveable.No)]
         public bool ShowDeadCharacters
         {
             get;
             private set;
         }
 
-        [Serialize(true, false)]
+        [Serialize(true, IsPropertySaveable.No)]
         public bool ShowTexts
         {
             get;
             private set;
         }
 
-        [Serialize("72,119,72,120", false)]
+        [Serialize("72,119,72,120", IsPropertySaveable.No)]
         public Color OverlayColor
         {
             get;
@@ -159,7 +159,8 @@ namespace Barotrauma.Items.Components
 
             if (OverlayColor.A > 0)
             {
-                GUI.UIGlow.Draw(spriteBatch, new Rectangle(0, 0, GameMain.GraphicsWidth, GameMain.GraphicsHeight), OverlayColor);
+                GUIStyle.UIGlow.Draw(spriteBatch, new Rectangle(0, 0, GameMain.GraphicsWidth, GameMain.GraphicsHeight),
+                    OverlayColor);
             }
 
             if (ShowTexts)
@@ -208,7 +209,7 @@ namespace Barotrauma.Items.Components
                     float dist = Vector2.DistanceSquared(refEntity.WorldPosition, c.WorldPosition);
                     if (dist > Range * Range) { continue; }
 
-                    Sprite pingCircle = GUI.Style.UIThermalGlow.Sprite;
+                    Sprite pingCircle = GUIStyle.UIThermalGlow.Value.Sprite;
                     foreach (Limb limb in c.AnimController.Limbs)
                     {
                         if (limb.Mass < 1.0f) { continue; }
@@ -230,71 +231,71 @@ namespace Barotrauma.Items.Components
             Vector2 hudPos = GameMain.GameScreen.Cam.WorldToScreen(target.DrawPosition);
             hudPos += Vector2.UnitX * 50.0f;
 
-            List<string> texts = new List<string>();
+            List<LocalizedString> texts = new List<LocalizedString>();
             List<Color> textColors = new List<Color>();
             texts.Add(target.Info == null ? target.DisplayName : target.Info.DisplayName);
-            Color nameColor = GUI.Style.TextColor;
+            Color nameColor = GUIStyle.TextColorNormal;
             if (Character.Controlled != null && target.TeamID != Character.Controlled.TeamID)
             {
-                nameColor = target.TeamID == CharacterTeamType.FriendlyNPC ? Color.SkyBlue : GUI.Style.Red;
+                nameColor = target.TeamID == CharacterTeamType.FriendlyNPC ? Color.SkyBlue : GUIStyle.Red;
             }
             textColors.Add(nameColor);
             
             if (target.IsDead)
             {
                 texts.Add(TextManager.Get("Deceased"));
-                textColors.Add(GUI.Style.Red);
+                textColors.Add(GUIStyle.Red);
                 if (target.CauseOfDeath != null)
                 {
                     texts.Add(
                         target.CauseOfDeath.Affliction?.CauseOfDeathDescription ??
                         TextManager.AddPunctuation(':', TextManager.Get("CauseOfDeath"), TextManager.Get("CauseOfDeath." + target.CauseOfDeath.Type.ToString())));
-                    textColors.Add(GUI.Style.Red);
+                    textColors.Add(GUIStyle.Red);
                 }
             }
             else
             {
-                if (!string.IsNullOrEmpty(target.customInteractHUDText) && target.AllowCustomInteract)
+                if (!target.CustomInteractHUDText.IsNullOrEmpty() && target.AllowCustomInteract)
                 {
-                    texts.Add(target.customInteractHUDText);
-                    textColors.Add(GUI.Style.Green);
+                    texts.Add(target.CustomInteractHUDText);
+                    textColors.Add(GUIStyle.Green);
                 }
                 if (!target.IsIncapacitated && target.IsPet)
                 {
-                    texts.Add(CharacterHUD.GetCachedHudText("PlayHint", GameMain.Config.KeyBindText(InputType.Use)));
-                    textColors.Add(GUI.Style.Green);
+                    texts.Add(CharacterHUD.GetCachedHudText("PlayHint", InputType.Use));
+                    textColors.Add(GUIStyle.Green);
                 }
                 if (target.CharacterHealth.UseHealthWindow && !target.DisableHealthWindow && equipper?.FocusedCharacter == target && equipper.CanInteractWith(target, 160f, false))
                 {
-                    texts.Add(CharacterHUD.GetCachedHudText("HealHint", GameMain.Config.KeyBindText(InputType.Health)));
-                    textColors.Add(GUI.Style.Green);
+                    texts.Add(CharacterHUD.GetCachedHudText("HealHint", InputType.Health));
+                    textColors.Add(GUIStyle.Green);
                 }
                 if (target.CanBeDragged)
                 {
-                    texts.Add(CharacterHUD.GetCachedHudText("GrabHint", GameMain.Config.KeyBindText(InputType.Grab)));
-                    textColors.Add(GUI.Style.Green);
+                    texts.Add(CharacterHUD.GetCachedHudText("GrabHint", InputType.Grab));
+                    textColors.Add(GUIStyle.Green);
                 }
 
                 if (target.IsUnconscious)
                 {
                     texts.Add(TextManager.Get("Unconscious"));
-                    textColors.Add(GUI.Style.Orange);
+                    textColors.Add(GUIStyle.Orange);
                 }
                 if (target.Stun > 0.01f)
                 {
                     texts.Add(TextManager.Get("Stunned"));
-                    textColors.Add(GUI.Style.Orange);
+                    textColors.Add(GUIStyle.Orange);
                 }
 
                 int oxygenTextIndex = MathHelper.Clamp((int)Math.Floor((1.0f - (target.Oxygen / 100.0f)) * OxygenTexts.Length), 0, OxygenTexts.Length - 1);
                 texts.Add(OxygenTexts[oxygenTextIndex]);
-                textColors.Add(Color.Lerp(GUI.Style.Red, GUI.Style.Green, target.Oxygen / 100.0f));
+                textColors.Add(Color.Lerp(GUIStyle.Red, GUIStyle.Green, target.Oxygen / 100.0f));
 
                 if (target.Bleeding > 0.0f)
                 {
                     int bleedingTextIndex = MathHelper.Clamp((int)Math.Floor(target.Bleeding / 100.0f) * BleedingTexts.Length, 0, BleedingTexts.Length - 1);
                     texts.Add(BleedingTexts[bleedingTextIndex]);
-                    textColors.Add(Color.Lerp(GUI.Style.Orange, GUI.Style.Red, target.Bleeding / 100.0f));
+                    textColors.Add(Color.Lerp(GUIStyle.Orange, GUIStyle.Red, target.Bleeding / 100.0f));
                 }
 
                 var allAfflictions = target.CharacterHealth.GetAllAfflictions();
@@ -315,21 +316,21 @@ namespace Barotrauma.Items.Components
                 foreach (AfflictionPrefab affliction in combinedAfflictionStrengths.Keys)
                 {
                     texts.Add(TextManager.AddPunctuation(':', affliction.Name, Math.Max((int)combinedAfflictionStrengths[affliction], 1).ToString() + " %"));
-                    textColors.Add(Color.Lerp(GUI.Style.Orange, GUI.Style.Red, combinedAfflictionStrengths[affliction] / affliction.MaxStrength));
+                    textColors.Add(Color.Lerp(GUIStyle.Orange, GUIStyle.Red, combinedAfflictionStrengths[affliction] / affliction.MaxStrength));
                 }
             }
 
-            GUI.DrawString(spriteBatch, hudPos, texts[0], textColors[0] * alpha, Color.Black * 0.7f * alpha, 2, GUI.SubHeadingFont);
+            GUI.DrawString(spriteBatch, hudPos, texts[0], textColors[0] * alpha, Color.Black * 0.7f * alpha, 2, GUIStyle.SubHeadingFont);
             hudPos.X += 5.0f;
-            hudPos.Y += 24.0f;
+            hudPos.Y += 24.0f * GameSettings.CurrentConfig.Graphics.TextScale;
 
             hudPos.X = (int)hudPos.X;
             hudPos.Y = (int)hudPos.Y;
 
             for (int i = 1; i < texts.Count; i++)
             {
-                GUI.DrawString(spriteBatch, hudPos, texts[i], textColors[i] * alpha, Color.Black * 0.7f * alpha, 2, GUI.SmallFont);
-                hudPos.Y += 18.0f;
+                GUI.DrawString(spriteBatch, hudPos, texts[i], textColors[i] * alpha, Color.Black * 0.7f * alpha, 2, GUIStyle.SmallFont);
+                hudPos.Y += (int)(18.0f * GameSettings.CurrentConfig.Graphics.TextScale);
             }
         }
     }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Turret.cs

@@ -57,42 +57,42 @@ namespace Barotrauma.Items.Components
         private readonly List<ParticleEmitter> particleEmitters = new List<ParticleEmitter>();
         private readonly List<ParticleEmitter> particleEmitterCharges = new List<ParticleEmitter>();
 
-        [Editable, Serialize("0,0,0,0", true, description: "Optional screen tint color when the item is being operated (R,G,B,A).")]
+        [Editable, Serialize("0,0,0,0", IsPropertySaveable.Yes, description: "Optional screen tint color when the item is being operated (R,G,B,A).")]
         public Color HudTint
         {
             get;
             private set;
         }
 
-        [Serialize(false, false, description: "Should the charge of the connected batteries/supercapacitors be shown at the top of the screen when operating the item.")]
+        [Serialize(false, IsPropertySaveable.No, description: "Should the charge of the connected batteries/supercapacitors be shown at the top of the screen when operating the item.")]
         public bool ShowChargeIndicator
         {
             get;
             private set;
         }
 
-        [Serialize(false, false, description: "Should the available ammunition be shown at the top of the screen when operating the item.")]
+        [Serialize(false, IsPropertySaveable.No, description: "Should the available ammunition be shown at the top of the screen when operating the item.")]
         public bool ShowProjectileIndicator
         {
             get;
             private set;
         }
 
-        [Serialize(0.0f, false, description: "How far the barrel \"recoils back\" when the turret is fired (in pixels).")]
+        [Serialize(0.0f, IsPropertySaveable.No, description: "How far the barrel \"recoils back\" when the turret is fired (in pixels).")]
         public float RecoilDistance
         {
             get;
             private set;
         }
 
-        [Serialize(0.0f, false, description: "The distance in which the spinning barrels rotate. Only used if spinning barrels are created.")]
+        [Serialize(0.0f, IsPropertySaveable.No, description: "The distance in which the spinning barrels rotate. Only used if spinning barrels are created.")]
         public float SpinningBarrelDistance
         {
             get;
             private set;
         }
 
-        [Serialize(false, false, description: "Use firing offset for muzzleflash? This field shouldn't be needed but I'm using it for prototyping")]
+        [Serialize(false, IsPropertySaveable.No, description: "Use firing offset for muzzleflash? This field shouldn't be needed but I'm using it for prototyping")]
         public bool UseFiringOffsetForMuzzleFlash
         {
             get;
@@ -125,33 +125,33 @@ namespace Barotrauma.Items.Components
             get { return barrelSprite; }
         }
 
-        partial void InitProjSpecific(XElement element)
+        partial void InitProjSpecific(ContentXElement element)
         {
-            foreach (XElement subElement in element.Elements())
+            foreach (var subElement in element.Elements())
             {
-                string texturePath = subElement.GetAttributeString("texture", "");
+                string textureDir = GetTextureDirectory(subElement);
                 switch (subElement.Name.ToString().ToLowerInvariant())
                 {
                     case "crosshair":
-                        crosshairSprite = new Sprite(subElement, texturePath.Contains("/") ? "" : Path.GetDirectoryName(item.Prefab.FilePath));
+                        crosshairSprite = new Sprite(subElement, path: textureDir);
                         break;
                     case "weaponindicator":
-                        WeaponIndicatorSprite = new Sprite(subElement, texturePath.Contains("/") ? "" : Path.GetDirectoryName(item.Prefab.FilePath));
+                        WeaponIndicatorSprite = new Sprite(subElement, path: textureDir);
                         break;
                     case "crosshairpointer":
-                        crosshairPointerSprite = new Sprite(subElement, texturePath.Contains("/") ? "" : Path.GetDirectoryName(item.Prefab.FilePath));
+                        crosshairPointerSprite = new Sprite(subElement, path: textureDir);
                         break;
                     case "startmovesound":
-                        startMoveSound = Submarine.LoadRoundSound(subElement, false);
+                        startMoveSound = RoundSound.Load(subElement, false);
                         break;
                     case "endmovesound":
-                        endMoveSound = Submarine.LoadRoundSound(subElement, false);
+                        endMoveSound = RoundSound.Load(subElement, false);
                         break;
                     case "movesound":
-                        moveSound = Submarine.LoadRoundSound(subElement, false);
+                        moveSound = RoundSound.Load(subElement, false);
                         break;
                     case "chargesound":
-                        chargeSound = Submarine.LoadRoundSound(subElement, false);
+                        chargeSound = RoundSound.Load(subElement, false);
                         break;
                     case "particleemitter":
                         particleEmitters.Add(new ParticleEmitter(subElement));
@@ -437,15 +437,15 @@ namespace Barotrauma.Items.Components
 
             if (Math.Abs(minRotation - maxRotation) < 0.02f)
             {
-                spriteBatch.DrawLine(drawPos, drawPos + center * circleRadius, GUI.Style.Green, thickness: lineThickness);
+                spriteBatch.DrawLine(drawPos, drawPos + center * circleRadius, GUIStyle.Green, thickness: lineThickness);
             }
             else if (radians > Math.PI * 2)
             {
-                spriteBatch.DrawCircle(drawPos, circleRadius, 180, GUI.Style.Red, thickness: lineThickness);
+                spriteBatch.DrawCircle(drawPos, circleRadius, 180, GUIStyle.Red, thickness: lineThickness);
             }
             else
             {
-                spriteBatch.DrawSector(drawPos, circleRadius, radians, (int)Math.Abs(90 * radians), GUI.Style.Green, offset: minRotation, thickness: lineThickness);
+                spriteBatch.DrawSector(drawPos, circleRadius, radians, (int)Math.Abs(90 * radians), GUIStyle.Green, offset: minRotation, thickness: lineThickness);
             }
 
             int baseWidgetScale = GUI.IntScale(16);
@@ -459,7 +459,7 @@ namespace Barotrauma.Items.Components
                 };
                 widget.MouseDown += () =>
                 {
-                    widget.color = GUI.Style.Green;
+                    widget.color = GUIStyle.Green;
                     prevAngle = minRotation;
                 };
                 widget.Deselected += () =>
@@ -469,7 +469,7 @@ namespace Barotrauma.Items.Components
                     RotationLimits = RotationLimits;
                     if (SubEditorScreen.IsSubEditor())
                     {
-                        SubEditorScreen.StoreCommand(new PropertyCommand(this, "RotationLimits", RotationLimits, oldRotation));
+                        SubEditorScreen.StoreCommand(new PropertyCommand(this, "RotationLimits".ToIdentifier(), RotationLimits, oldRotation));
                     }
                 };
                 widget.MouseHeld += (deltaTime) =>
@@ -503,7 +503,7 @@ namespace Barotrauma.Items.Components
                 };
                 widget.MouseDown += () =>
                 {
-                    widget.color = GUI.Style.Green;
+                    widget.color = GUIStyle.Green;
                     prevAngle = maxRotation;
                 };
                 widget.Deselected += () =>
@@ -513,7 +513,7 @@ namespace Barotrauma.Items.Components
                     RotationLimits = RotationLimits;
                     if (SubEditorScreen.IsSubEditor())
                     {
-                        SubEditorScreen.StoreCommand(new PropertyCommand(this, "RotationLimits", RotationLimits, oldRotation));
+                        SubEditorScreen.StoreCommand(new PropertyCommand(this, "RotationLimits".ToIdentifier(), RotationLimits, oldRotation));
                     }
                 };
                 widget.MouseHeld += (deltaTime) =>
@@ -654,8 +654,8 @@ namespace Barotrauma.Items.Components
             if (ShowChargeIndicator && PowerConsumption > 0.0f)
             {
                 powerIndicator.Color = charged ? 
-                    (HasPowerToShoot() ? GUI.Style.Green : GUI.Style.Orange) : 
-                    GUI.Style.Red;
+                    (HasPowerToShoot() ? GUIStyle.Green : GUIStyle.Orange) : 
+                    GUIStyle.Red;
                 if (flashLowPower)
                 {
                     powerIndicator.BarSize = 1;
@@ -693,7 +693,7 @@ namespace Barotrauma.Items.Components
                 Rectangle rect = new Rectangle(invSlotPos.X, invSlotPos.Y, totalWidth, slotSize.Y);
                 float inflate = MathHelper.Lerp(3, 8, (float)Math.Abs(Math.Sin(flashTimer * 5)));
                 rect.Inflate(inflate, inflate);
-                Color color = GUI.Style.Red * Math.Max(0.5f, (float)Math.Sin(flashTimer * 12));
+                Color color = GUIStyle.Red * Math.Max(0.5f, (float)Math.Sin(flashTimer * 12));
                 if (flashNoAmmo)
                 {
                     GUI.DrawRectangle(spriteBatch, rect, color, thickness: 3);
@@ -701,7 +701,7 @@ namespace Barotrauma.Items.Components
                 else if (flashLoaderBroken)
                 {
                     GUI.DrawRectangle(spriteBatch, rect, color, thickness: 3);
-                    GUI.BrokenIcon.Draw(spriteBatch, rect.Center.ToVector2(), color, scale: rect.Height / GUI.BrokenIcon.size.Y);
+                    GUIStyle.BrokenIcon.Value.Sprite.Draw(spriteBatch, rect.Center.ToVector2(), color, scale: rect.Height / GUIStyle.BrokenIcon.Value.Sprite.size.Y);
                     GUIComponent.DrawToolTip(spriteBatch, TextManager.Get("turretloaderbroken"), new Rectangle(invSlotPos.X + totalWidth + GUI.IntScale(10), invSlotPos.Y + slotSize.Y / 2 - GUI.IntScale(9), 0, 0));
                 }
             }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Wearable.cs

@@ -1,25 +1,25 @@
 using System;
 using System.Linq;
+using Barotrauma.Networking;
 
 namespace Barotrauma.Items.Components
 {
-    partial class Wearable
+    partial class Wearable : Pickable, IServerSerializable
     {
-        private void GetDamageModifierText(ref string description, DamageModifier damageModifier, string afflictionIdentifier)
+        private void GetDamageModifierText(ref LocalizedString description, DamageModifier damageModifier, Identifier afflictionIdentifier)
         {
             int roundedValue = (int)Math.Round((1 - damageModifier.DamageMultiplier * damageModifier.ProbabilityMultiplier) * 100);
             if (roundedValue == 0) { return; }
-            string colorStr = XMLExtensions.ColorToString(GUI.Style.Green);
+            string colorStr = XMLExtensions.ColorToString(GUIStyle.Green);
 
-            string afflictionName =
-                AfflictionPrefab.List.FirstOrDefault(ap => ap.Identifier.Equals(afflictionIdentifier, StringComparison.OrdinalIgnoreCase))?.Name ??
-                TextManager.Get($"afflictiontype.{afflictionIdentifier}", returnNull: true) ??
-                afflictionIdentifier;
+            LocalizedString afflictionName =
+                AfflictionPrefab.List.FirstOrDefault(ap => ap.Identifier == afflictionIdentifier)?.Name ??
+                TextManager.Get($"afflictiontype.{afflictionIdentifier}").Fallback(afflictionIdentifier.Value);
 
             description += $"\n  ‖color:{colorStr}‖{roundedValue.ToString("-0;+#")}%‖color:end‖ {afflictionName}";
         }
-
-        public override void AddTooltipInfo(ref string name, ref string description)
+        
+        public override void AddTooltipInfo(ref LocalizedString name, ref LocalizedString description)
         {
             if (damageModifiers.Any(d => !MathUtils.NearlyEqual(d.DamageMultiplier, 1f) || !MathUtils.NearlyEqual(d.ProbabilityMultiplier, 1f)) || SkillModifiers.Any())
             {
@@ -35,11 +35,11 @@ namespace Barotrauma.Items.Components
                         continue;
                     }
 
-                    foreach (string afflictionIdentifier in damageModifier.ParsedAfflictionIdentifiers)
+                    foreach (Identifier afflictionIdentifier in damageModifier.ParsedAfflictionIdentifiers)
                     {
                         GetDamageModifierText(ref description, damageModifier, afflictionIdentifier);
                     }
-                    foreach (string afflictionType in damageModifier.ParsedAfflictionTypes)
+                    foreach (Identifier afflictionType in damageModifier.ParsedAfflictionTypes)
                     {
                         GetDamageModifierText(ref description, damageModifier, afflictionType);
                     }
@@ -49,10 +49,10 @@ namespace Barotrauma.Items.Components
             {
                 foreach (var skillModifier in SkillModifiers)
                 {
-                    string colorStr = XMLExtensions.ColorToString(GUI.Style.Green);
+                    string colorStr = XMLExtensions.ColorToString(GUIStyle.Green);
                     int roundedValue = (int)Math.Round(skillModifier.Value);
                     if (roundedValue == 0) { continue; }
-                    description += $"\n  ‖color:{colorStr}‖{roundedValue.ToString("+0;-#")}‖color:end‖ {TextManager.Get("SkillName." + skillModifier.Key, true) ?? skillModifier.Key}";
+                    description += $"\n  ‖color:{colorStr}‖{roundedValue.ToString("+0;-#")}‖color:end‖ {TextManager.Get($"SkillName.{skillModifier.Key}").Fallback(skillModifier.Key.Value)}";
                 }
             }
         }