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

8
Content.Server/Construction/Completions/ConditionalAction.cs
View File

@@ -11,13 +11,13 @@ namespace Content.Server.Construction.Completions
[DataDefinition]
public class ConditionalAction : IGraphAction
{
[field: DataField("passUser")] public bool PassUser { get; } = false;
[DataField("passUser")] public bool PassUser { get; } = false;
[field: DataField("condition", required:true)] public IGraphCondition? Condition { get; } = null;
[DataField("condition", required:true)] public IGraphCondition? Condition { get; } = null;
[field: DataField("action", required:true)] public IGraphAction? Action { get; } = null;
[DataField("action", required:true)] public IGraphAction? Action { get; } = null;
[field: DataField("else")] public IGraphAction? Else { get; } = null;
[DataField("else")] public IGraphAction? Else { get; } = null;
public async Task PerformAction(IEntity entity, IEntity? user)
{

2
Content.Server/Construction/Completions/DeleteEntitiesInContainer.cs
View File

@@ -11,7 +11,7 @@ namespace Content.Server.Construction.Completions
[DataDefinition]
public class DeleteEntitiesInContainer : IGraphAction
{
[field: DataField("container")] public string Container { get; } = string.Empty;
[DataField("container")] public string Container { get; } = string.Empty;
public async Task PerformAction(IEntity entity, IEntity? user)
{

4
Content.Server/Construction/Completions/MoveContainer.cs
View File

@@ -13,8 +13,8 @@ namespace Content.Server.Construction.Completions
[DataDefinition]
public class MoveContainer : IGraphAction
{
[field: DataField("from")] public string? FromContainer { get; } = null;
[field: DataField("to")] public string? ToContainer { get; } = null;
[DataField("from")] public string? FromContainer { get; } = null;
[DataField("to")] public string? ToContainer { get; } = null;
public async Task PerformAction(IEntity entity, IEntity? user)
{

2
Content.Server/Construction/Completions/PopupEveryone.cs
View File

@@ -10,7 +10,7 @@ namespace Content.Server.Construction.Completions
[DataDefinition]
public class PopupEveryone : IGraphAction
{
[field: DataField("text")] public string Text { get; } = string.Empty;
[DataField("text")] public string Text { get; } = string.Empty;
public async Task PerformAction(IEntity entity, IEntity? user)
{

4
Content.Server/Construction/Completions/PopupUser.cs
View File

@@ -12,8 +12,8 @@ namespace Content.Server.Construction.Completions
[DataDefinition]
public class PopupUser : IGraphAction
{
[field: DataField("cursor")] public bool Cursor { get; } = false;
[field: DataField("text")] public string Text { get; } = string.Empty;
[DataField("cursor")] public bool Cursor { get; } = false;
[DataField("text")] public string Text { get; } = string.Empty;
public async Task PerformAction(IEntity entity, IEntity? user)
{

7
Content.Server/Construction/Completions/SpawnPrototypeAtContainer.cs
View File

@@ -1,5 +1,4 @@
#nullable enable
using System;
using System.Threading.Tasks;
using Content.Shared.Construction;
using JetBrains.Annotations;
@@ -13,9 +12,9 @@ namespace Content.Server.Construction.Completions
[DataDefinition]
public class SpawnPrototypeAtContainer : IGraphAction
{
[field: DataField("prototype")] public string Prototype { get; } = string.Empty;
[field: DataField("container")] public string Container { get; } = string.Empty;
[field: DataField("amount")] public int Amount { get; } = 1;
[DataField("prototype")] public string Prototype { get; } = string.Empty;
[DataField("container")] public string Container { get; } = string.Empty;
[DataField("amount")] public int Amount { get; } = 1;
public async Task PerformAction(IEntity entity, IEntity? user)
{

2
Content.Server/Construction/Conditions/AllConditions.cs
View File

@@ -11,7 +11,7 @@ namespace Content.Server.Construction.Conditions
[DataDefinition]
public class AllConditions : IGraphCondition
{
[field: DataField("conditions")]
[DataField("conditions")]
public IGraphCondition[] Conditions { get; } = Array.Empty<IGraphCondition>();
public async Task<bool> Condition(IEntity entity)

2
Content.Server/Construction/Conditions/AnyConditions.cs
View File

@@ -11,7 +11,7 @@ namespace Content.Server.Construction.Conditions
[DataDefinition]
public class AnyConditions : IGraphCondition
{
[field: DataField("conditions")]
[DataField("conditions")]
public IGraphCondition[] Conditions { get; } = Array.Empty<IGraphCondition>();
public async Task<bool> Condition(IEntity entity)