Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

6
Content.Client/GameObjects/Components/Power/AME/AMEControllerBoundUserInterface.cs
View File

@@ -9,11 +9,10 @@ namespace Content.Client.GameObjects.Components.Power.AME
[UsedImplicitly]
public class AMEControllerBoundUserInterface : BoundUserInterface
{
private AMEWindow _window;
private AMEWindow? _window;
public AMEControllerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
{
}
protected override void Open()
@@ -31,7 +30,6 @@ namespace Content.Client.GameObjects.Components.Power.AME
_window.RefreshPartsButton.OnPressed += _ => ButtonPressed(UiButton.RefreshParts);
}
/// <summary>
/// Update the ui each time new state data is sent from the server.
/// </summary>
@@ -58,7 +56,7 @@ namespace Content.Client.GameObjects.Components.Power.AME
if (disposing)
{
_window.Dispose();
_window?.Dispose();
}
}
}

5
Content.Client/GameObjects/Components/Power/AME/AMEWindow.cs
View File

@@ -17,7 +17,7 @@ namespace Content.Client.GameObjects.Components.Power.AME
public Button IncreaseFuelButton { get; set; }
public Button DecreaseFuelButton { get; set; }
public Button RefreshPartsButton { get; set; }
public ProgressBar FuelMeter { get; set; }
public ProgressBar? FuelMeter { get; set; }
public Label FuelAmount { get; set; }
public Label InjectionAmount { get; set; }
public Label CoreCount { get; set; }
@@ -89,10 +89,8 @@ namespace Content.Client.GameObjects.Components.Power.AME
}
}
});
}
/// <summary>
/// This searches recursively through all the children of "parent"
/// and sets the Disabled value of any buttons found to "val"
@@ -162,7 +160,6 @@ namespace Content.Client.GameObjects.Components.Power.AME
CoreCount.Text = $"{castState.CoreCount}";
InjectionAmount.Text = $"{castState.InjectionAmount}";
}
}
}