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

Remove field: from DataField attributes (#3932)

Browse Source
This commit is contained in:
DrSmugleaf
2021-05-04 15:37:16 +02:00
committed by GitHub
parent 85f3871536
commit ad3b7fe97d
84 changed files with 228 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Construction/ComponentConstructionGraphStep.cs
View File

@@ -9,7 +9,7 @@ namespace Content.Shared.Construction
[DataDefinition]
public class ComponentConstructionGraphStep : ArbitraryInsertConstructionGraphStep
{
[field: DataField("component")] public string Component { get; } = string.Empty;
[DataField("component")] public string Component { get; } = string.Empty;
public override bool EntityValid(IEntity entity)
{

4
Content.Shared/Construction/ConstructionGraphPrototype.cs
View File

@@ -17,11 +17,11 @@ namespace Content.Shared.Construction
private readonly Dictionary<string, Dictionary<ConstructionGraphNode, ConstructionGraphNode?>> _pathfinding = new();
[ViewVariables]
[field: DataField("id", required: true)]
[DataField("id", required: true)]
public string ID { get; } = default!;
[ViewVariables]
[field: DataField("start")]
[DataField("start")]
public string? Start { get; }
[DataField("graph", priority: 0)]

18
Content.Shared/Construction/ConstructionPrototype.cs
View File

@@ -15,37 +15,37 @@ namespace Content.Shared.Construction
/// <summary>
/// Friendly name displayed in the construction GUI.
/// </summary>
[field: DataField("name")]
[DataField("name")]
public string Name { get; } = string.Empty;
/// <summary>
/// "Useful" description displayed in the construction GUI.
/// </summary>
[field: DataField("description")]
[DataField("description")]
public string Description { get; } = string.Empty;
/// <summary>
/// The <see cref="ConstructionGraphPrototype"/> this construction will be using.
/// </summary>
[field: DataField("graph")]
[DataField("graph")]
public string Graph { get; } = string.Empty;
/// <summary>
/// The target <see cref="ConstructionGraphNode"/> this construction will guide the user to.
/// </summary>
[field: DataField("targetNode")]
[DataField("targetNode")]
public string TargetNode { get; } = string.Empty;
/// <summary>
/// The starting <see cref="ConstructionGraphNode"/> this construction will start at.
/// </summary>
[field: DataField("startNode")]
[DataField("startNode")]
public string StartNode { get; } = string.Empty;
/// <summary>
/// Texture path inside the construction GUI.
/// </summary>
[field: DataField("icon")]
[DataField("icon")]
public SpriteSpecifier Icon { get; } = SpriteSpecifier.Invalid;
/// <summary>
@@ -59,16 +59,16 @@ namespace Content.Shared.Construction
[DataField("objectType")] public ConstructionType Type { get; private set; } = ConstructionType.Structure;
[ViewVariables]
[field: DataField("id", required: true)]
[DataField("id", required: true)]
public string ID { get; } = default!;
[field: DataField("placementMode")]
[DataField("placementMode")]
public string PlacementMode { get; } = "PlaceFree";
/// <summary>
/// Whether this construction can be constructed rotated or not.
/// </summary>
[field: DataField("canRotate")]
[DataField("canRotate")]
public bool CanRotate { get; } = true;
public IReadOnlyList<IConstructionCondition> Conditions => _conditions;

2
Content.Shared/Construction/EntityInsertConstructionGraphStep.cs
View File

@@ -7,7 +7,7 @@ namespace Content.Shared.Construction
[ImplicitDataDefinitionForInheritors]
public abstract class EntityInsertConstructionGraphStep : ConstructionGraphStep
{
[field: DataField("store")] public string Store { get; } = string.Empty;
[DataField("store")] public string Store { get; } = string.Empty;
public abstract bool EntityValid(IEntity entity);
}

4
Content.Shared/Construction/MaterialConstructionGraphStep.cs
View File

@@ -16,9 +16,9 @@ namespace Content.Shared.Construction
{
// TODO: Make this use the material system.
// TODO TODO: Make the material system not shit.
[field: DataField("material")] public string MaterialPrototypeId { get; } = "Steel";
[DataField("material")] public string MaterialPrototypeId { get; } = "Steel";
[field: DataField("amount")] public int Amount { get; } = 1;
[DataField("amount")] public int Amount { get; } = 1;
public StackPrototype MaterialPrototype =>
IoCManager.Resolve<IPrototypeManager>().Index<StackPrototype>(MaterialPrototypeId);

2
Content.Shared/Construction/PrototypeConstructionGraphStep.cs
View File

@@ -9,7 +9,7 @@ namespace Content.Shared.Construction
[DataDefinition]
public class PrototypeConstructionGraphStep : ArbitraryInsertConstructionGraphStep
{
[field: DataField("prototype")] public string Prototype { get; } = string.Empty;
[DataField("prototype")] public string Prototype { get; } = string.Empty;
public override bool EntityValid(IEntity entity)
{

6
Content.Shared/Construction/ToolConstructionGraphStep.cs
View File

@@ -9,11 +9,11 @@ namespace Content.Shared.Construction
[DataDefinition]
public class ToolConstructionGraphStep : ConstructionGraphStep
{
[field: DataField("tool")] public ToolQuality Tool { get; } = ToolQuality.None;
[DataField("tool")] public ToolQuality Tool { get; } = ToolQuality.None;
[field: DataField("fuel")] public float Fuel { get; } = 10;
[DataField("fuel")] public float Fuel { get; } = 10;
[field: DataField("examine")] public string ExamineOverride { get; } = string.Empty;
[DataField("examine")] public string ExamineOverride { get; } = string.Empty;
public override void DoExamine(FormattedMessage message, bool inDetailsRange)
{