tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable nullability in Content.Client (#3257)

Browse Source 
* Enable nullability in Content.Client

* Remove #nullable enable

* Merge fixes

* Remove Debug.Assert

* Merge fixes

* Fix build

* Fix build
This commit is contained in:
DrSmugleaf
2021-03-10 14:48:29 +01:00
committed by GitHub
parent 4f9bd4e802
commit 902aa128c2
270 changed files with 1774 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Client/VendingMachines/VendingMachineMenu.cs
View File

@@ -6,7 +6,6 @@ using Robust.Client.ResourceManagement;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using static Content.Shared.GameObjects.Components.VendingMachines.SharedVendingMachineComponent;
@@ -18,15 +17,17 @@ namespace Content.Client.VendingMachines
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
private readonly ItemList _items;
private List<VendingMachineInventoryEntry> _cachedInventory;
private List<VendingMachineInventoryEntry> _cachedInventory = new();
public VendingMachineBoundUserInterface Owner { get; set; }
public VendingMachineBoundUserInterface Owner { get; }
public VendingMachineMenu()
public VendingMachineMenu(VendingMachineBoundUserInterface owner)
{
SetSize = MinSize = (300, 450);
IoCManager.InjectDependencies(this);
Owner = owner;
_items = new ItemList()
{
SizeFlagsStretchRatio = 8,
@@ -45,10 +46,10 @@ namespace Content.Client.VendingMachines
{
var itemName = _prototypeManager.Index<EntityPrototype>(entry.ID).Name;
Texture icon = null;
if(_prototypeManager.TryIndex(entry.ID, out EntityPrototype prototype))
Texture? icon = null;
if(_prototypeManager.TryIndex(entry.ID, out EntityPrototype? prototype))
{
icon = SpriteComponent.GetPrototypeIcon(prototype, _resourceCache)?.Default;
icon = SpriteComponent.GetPrototypeIcon(prototype, _resourceCache).Default;
}
_items.AddItem($"{itemName} ({entry.Amount} left)", icon);
}