MaterialComponent cleanup (#13326)

Content.Server/Cargo/Systems/PricingSystem.cs

@@ -163,6 +163,16 @@ public sealed class PricingSystem : EntitySystem
         return price;
     }
 
+    public double GetMaterialPrice(MaterialComponent component)
+    {
+        double price = 0;
+        foreach (var (id, quantity) in component.Materials)
+        {
+            price += _prototypeManager.Index<MaterialPrototype>(id).Price * quantity;
+        }
+        return price;
+    }
+
     /// <summary>
     /// Appraises an entity, returning it's price.
     /// </summary>
@@ -181,10 +191,11 @@ public sealed class PricingSystem : EntitySystem
 
         if (TryComp<MaterialComponent>(uid, out var material) && !HasComp<StackPriceComponent>(uid))
         {
+            var matPrice = GetMaterialPrice(material);
             if (TryComp<StackComponent>(uid, out var stack))
-                ev.Price += stack.Count * material.Materials.Sum(x => x.Price * material._materials[x.ID]);
-            else
-                ev.Price += material.Materials.Sum(x => x.Price);
+                matPrice *= stack.Count;
+
+            ev.Price += matPrice;
         }
 
         if (TryComp<ContainerManagerComponent>(uid, out var containers))

Content.Server/Lathe/LatheSystem.cs

@@ -217,7 +217,7 @@ namespace Content.Server.Lathe
 
         private void OnMaterialEntityInserted(EntityUid uid, LatheComponent component, MaterialEntityInsertedEvent args)
         {
-            var lastMat = args.Materials.Keys.Last();
+            var lastMat = args.MaterialComp.Materials.Keys.Last();
             // We need the prototype to get the color
             _proto.TryIndex(lastMat, out MaterialPrototype? matProto);
             EnsureComp<LatheInsertingComponent>(uid).TimeRemaining = component.InsertionTime;

Content.Server/Materials/MaterialStorageSystem.cs

@@ -27,6 +27,9 @@ public sealed class MaterialStorageSystem : SharedMaterialStorageSystem
 
     private void OnDeconstructed(EntityUid uid, MaterialStorageComponent component, MachineDeconstructedEvent args)
     {
+        if (!component.DropOnDeconstruct)
+            return;
+
         foreach (var (material, amount) in component.Storage)
         {
             _stackSystem.SpawnMultipleFromMaterial(amount, material, Transform(uid).Coordinates);

Content.Server/Stack/StackSystem.cs

@@ -110,7 +110,7 @@ namespace Content.Server.Stack
                 return list;
 
             int maxCountPerStack = _sharedStack.GetMaxCount(stack);
-            var materialPerStack = material._materials[materialProto.ID];
+            var materialPerStack = material.Materials[materialProto.ID];
 
             var materialPerMaxCount = maxCountPerStack * materialPerStack;