v1.7.7.0 (Winter Update 2024)

2024-12-11 13:26:13 +02:00
parent 7d5b7a310a
commit f6349b2175
256 changed files with 4794 additions and 1653 deletions
@@ -372,17 +372,17 @@ namespace Barotrauma.Items.Components
            outputContainer.Inventory.RectTransform = outputInventoryHolder.RectTransform;
        }

-        private static LocalizedString GetRecipeNameAndAmount(FabricationRecipe fabricationRecipe)
+        private static RichString GetRecipeNameAndAmount(FabricationRecipe fabricationRecipe)
        {
            if (fabricationRecipe == null) { return ""; }
            if (fabricationRecipe.Amount > 1)
            {
                return TextManager.GetWithVariables("fabricationrecipenamewithamount",
-                    ("[name]", fabricationRecipe.DisplayName), ("[amount]", fabricationRecipe.Amount.ToString()));
+                    ("[name]", RichString.Rich(fabricationRecipe.DisplayName)), ("[amount]", fabricationRecipe.Amount.ToString()));
            }
            else
            {
-                return fabricationRecipe.DisplayName;
+                return RichString.Rich(fabricationRecipe.DisplayName);
            }
        }

@@ -1978,25 +1978,6 @@ namespace Barotrauma.Items.Components
                2, GUIStyle.SmallFont);
        }

-        protected override void RemoveComponentSpecific()
-        {
-            base.RemoveComponentSpecific();
-            sonarBlip?.Remove();
-            pingCircle?.Remove();
-            directionalPingCircle?.Remove();
-            screenOverlay?.Remove();
-            screenBackground?.Remove();
-            lineSprite?.Remove();
-
-            foreach (var t in targetIcons.Values)
-            {
-                t.Item1.Remove();
-            }
-            targetIcons.Clear();
-
-            MineralClusters = null;
-        }
-
        public void ClientEventWrite(IWriteMessage msg, NetEntityEvent.IData extraData = null)
        {
            msg.WriteBoolean(currentMode == Mode.Active);