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

19
Content.Shared/Research/LatheRecipePrototype.cs
View File

@@ -1,3 +1,4 @@
#nullable enable
using System;
using System.Collections.Generic;
using Robust.Shared.IoC;
@@ -12,13 +13,13 @@ namespace Content.Shared.Research
[NetSerializable, Serializable, Prototype("latheRecipe")]
public class LatheRecipePrototype : IPrototype
{
private string _name;
private string _id;
private SpriteSpecifier _icon;
private string _description;
private string _result;
private string _name = string.Empty;
private string _id = string.Empty;
private SpriteSpecifier _icon = SpriteSpecifier.Invalid;
private string _description = string.Empty;
private string _result = string.Empty;
private int _completeTime;
private Dictionary<string, int> _requiredMaterials;
private Dictionary<string, int> _requiredMaterials = new();
[ViewVariables]
public string ID => _id;
@@ -34,7 +35,7 @@ namespace Content.Shared.Research
if (_name.Trim().Length != 0) return _name;
var protoMan = IoCManager.Resolve<IPrototypeManager>();
if (protoMan == null) return _description;
protoMan.TryIndex(_result, out EntityPrototype prototype);
protoMan.TryIndex(_result, out EntityPrototype? prototype);
if (prototype?.Name != null)
_name = prototype.Name;
return _name;
@@ -52,7 +53,7 @@ namespace Content.Shared.Research
if (_description.Trim().Length != 0) return _description;
var protoMan = IoCManager.Resolve<IPrototypeManager>();
if (protoMan == null) return _description;
protoMan.TryIndex(_result, out EntityPrototype prototype);
protoMan.TryIndex(_result, out EntityPrototype? prototype);
if (prototype?.Description != null)
_description = prototype.Description;
return _description;
@@ -98,7 +99,7 @@ namespace Content.Shared.Research
serializer.DataField(ref _id, "id", string.Empty);
serializer.DataField(ref _description, "description", string.Empty);
serializer.DataField(ref _icon, "icon", SpriteSpecifier.Invalid);
serializer.DataField(ref _result, "result", null);
serializer.DataField(ref _result, "result", string.Empty);
serializer.DataField(ref _completeTime, "completetime", 2500);
serializer.DataField(ref _requiredMaterials, "materials", new Dictionary<string, int>());
}

15
Content.Shared/Research/TechnologyPrototype.cs
View File

@@ -1,4 +1,5 @@
using System;
#nullable enable
using System;
using System.Collections.Generic;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
@@ -11,13 +12,13 @@ namespace Content.Shared.Research
[NetSerializable, Serializable, Prototype("technology")]
public class TechnologyPrototype : IPrototype
{
private string _name;
private string _id;
private SpriteSpecifier _icon;
private string _description;
private string _name = string.Empty;
private string _id = string.Empty;
private SpriteSpecifier _icon = SpriteSpecifier.Invalid;
private string _description = string.Empty;
private int _requiredPoints;
private List<string> _requiredTechnologies;
private List<string> _unlockedRecipes;
private List<string> _requiredTechnologies = new();
private List<string> _unlockedRecipes = new();
/// <summary>
/// The ID of this technology prototype.