Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Added nullable to most Content.Shared files (#3238)

Browse Source 
* Add nullable to some Content.Shared files.

* Use [NotNullWhen(true)]

* Undo adding now redundant !'s

* Forgot one

* Add a ton more nullable

* You can guess

* Fix some issues

* It actually compiles now

* Auto stash before merge of "null2" and "origin/master"

* I lied

* enable annotations -> enable

* Revert ActionBlockerSystem.cs to original

* Fix ActionBlockerSystem.cs

* More nullable

* Undo some added exclamation marks

* Fix issues

* Update Content.Shared/Maps/ContentTileDefinition.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Resolve some issues

* Remove unused method

* Fix more issues

* Fix more issues

* Fix more issues

* Fix more issues

* Fix issue, rollback SharedGhostComponent.cs

* Update submodule

* Fix issue, invert some if-statements to reduce nesting

* Revert RobustToolbox

* FIx things broken by merge

* Some fixes

- Replaced with string.Empty
- Remove some exclamation marks
- Revert file

* Some fixes

* Trivial #nullable enable

* Fix null ables

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
This commit is contained in:
Visne
2021-02-27 04:12:09 +01:00
committed by GitHub
parent 2f45e5e044
commit 9b94d5c195
377 changed files with 1048 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Shared/Prototypes/Cargo/CargoOrderData.cs
View File

@@ -1,4 +1,5 @@
using System;
#nullable enable
using System;
using Robust.Shared.Serialization;
namespace Content.Shared.Prototypes.Cargo

35
Content.Shared/Prototypes/Cargo/CargoProductPrototype.cs
View File

@@ -1,4 +1,5 @@
using System;
#nullable enable
using System;
using Robust.Shared.IoC;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
@@ -11,14 +12,14 @@ namespace Content.Shared.Prototypes.Cargo
[NetSerializable, Serializable, Prototype("cargoProduct")]
public class CargoProductPrototype : IPrototype
{
private string _id;
private string _name;
private string _description;
private SpriteSpecifier _icon;
private string _product;
private string _id = string.Empty;
private string _name = string.Empty;
private string _description = string.Empty;
private SpriteSpecifier _icon = SpriteSpecifier.Invalid;
private string _product = string.Empty;
private int _pointCost;
private string _category;
private string _group;
private string _category = string.Empty;
private string _group = string.Empty;
[ViewVariables]
public string ID => _id;
@@ -33,10 +34,12 @@ namespace Content.Shared.Prototypes.Cargo
{
if (_name.Trim().Length != 0)
return _name;
EntityPrototype prototype = null;
IoCManager.Resolve<IPrototypeManager>()?.TryIndex(_product, out prototype);
if (prototype?.Name != null)
if (IoCManager.Resolve<IPrototypeManager>().TryIndex(_product, out EntityPrototype? prototype))
{
_name = prototype.Name;
}
return _name;
}
}
@@ -51,10 +54,12 @@ namespace Content.Shared.Prototypes.Cargo
{
if (_description.Trim().Length != 0)
return _description;
EntityPrototype prototype = null;
IoCManager.Resolve<IPrototypeManager>()?.TryIndex(_product, out prototype);
if (prototype?.Description != null)
if (IoCManager.Resolve<IPrototypeManager>().TryIndex(_product, out EntityPrototype? prototype))
{
_description = prototype.Description;
}
return _description;
}
}
@@ -102,7 +107,7 @@ namespace Content.Shared.Prototypes.Cargo
serializer.DataField(ref _id, "id", string.Empty);
serializer.DataField(ref _description, "description", string.Empty);
serializer.DataField(ref _icon, "icon", SpriteSpecifier.Invalid);
serializer.DataField(ref _product, "product", null);
serializer.DataField(ref _product, "product", string.Empty);
serializer.DataField(ref _pointCost, "cost", 0);
serializer.DataField(ref _category, "category", string.Empty);
serializer.DataField(ref _group, "group", string.Empty);

9
Content.Shared/Prototypes/DatasetPrototype.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
#nullable enable
using System.Collections.Generic;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using YamlDotNet.RepresentationModel;
@@ -8,17 +9,17 @@ namespace Content.Shared.Prototypes
[Prototype("dataset")]
public class DatasetPrototype : IPrototype
{
private string _id;
private string _id = string.Empty;
public string ID => _id;
private List<string> _values;
private List<string> _values = new();
public IReadOnlyList<string> Values => _values;
public void LoadFrom(YamlMappingNode mapping)
{
var ser = YamlObjectSerializer.NewReader(mapping);
ser.DataField(ref _id, "id", "");
ser.DataField(ref _id, "id", string.Empty);
ser.DataField(ref _values, "values", new List<string>());
}
}

13
Content.Shared/Prototypes/Kitchen/MicrowaveMealRecipePrototype.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
#nullable enable
using System.Collections.Generic;
using Robust.Shared.Localization;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
@@ -12,13 +13,13 @@ namespace Content.Shared.Prototypes.Kitchen
[Prototype("microwaveMealRecipe")]
public class FoodRecipePrototype : IPrototype
{
private string _id;
private string _name;
private string _result;
private string _id = string.Empty;
private string _name = string.Empty;
private string _result = string.Empty;
private int _cookTime;
private Dictionary<string, int> _ingsReagents;
private Dictionary<string, int> _ingsSolids;
private Dictionary<string, int> _ingsReagents = new();
private Dictionary<string, int> _ingsSolids = new();
public string Name => Loc.GetString(_name);
public string ID => _id;

9
Content.Shared/Prototypes/PDA/UplinkStoreListingPrototype.cs
View File

@@ -1,3 +1,4 @@
#nullable enable
using Content.Shared.GameObjects.Components.PDA;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
@@ -8,12 +9,12 @@ namespace Content.Shared.Prototypes.PDA
[Prototype("uplinkListing")]
public class UplinkStoreListingPrototype : IPrototype
{
private string _id;
private string _itemId;
private string _id = string.Empty;
private string _itemId = string.Empty;
private int _price;
private UplinkCategory _category;
private string _desc;
private string _name;
private string _desc = string.Empty;
private string _name = string.Empty;
public string ID => _id;