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

Serialization v3 content PR (#3491)

Browse Source 
* serv3 in shared pt 1

* beginning of deepclone api

* progress in implementing ideepclone & serv3 in content

* adds target

* its cant hurt you it cant hurt you

* more changes to content.server

* adds dataclasses

* almost there

* renamed & edited entry

* finishes refactoring content to use serv3

* gasmixture runtimes, next: reagentunit

* fucin hell that was an annoying one

* adds flags

* fixes some yaml errors

* removes comment

* fixes generic components for now

* removes todo
actually clones values my god paul
fixes bug involving resolving custom data classes from other proj
renames dataclass
fixes spritecomp
adds WithFormat.Constants support

* adds deepclone to ResistanceSet

* adds a bunch of deepclone implementations
adds a deepclone analyzer (TODO)
adds a deep clone fallback for classes & structs

* fixes a bunch of runtimes

* adds deepclone to entityuid

* adds generator to sln

* gets rid of warnings

* fixes

* argh

* componentdata refactors

* more deepclone impl

* heck me i reworked all of content deepclone

* renames custom dataclasstarget

* misc

* reworks prototypes

* deepclone nuke

* renamed customdataclass attribute

* fixes everything

* misc fixed

* the killcommit

* getting there

* changed yamlfieldattribute namespace

* adds back iselfserialize

* renames everything to data(field/definition)

* ouch

* Fix most errors on content

* Fix more errors in content

* Fix some components

* work on tests

* fixes some customdataclasses

* fuggin shit

* yes

* yeas

* Remove data classes

* Data field naming fixes

* arg

* Git resetti RobustToolbox

* Merge fixes

* General fixes

* Fix startup serialization errors

* Fix DamageContainerPrototype when supported classes or types are null

* Implement construction graph step type serializer

* Fix up construction serialization

* Fix up construction serialization part 2

* Fix null list in technology database component

* Fix body serialization

* Fix entity storage serialization

* Fix actions serialization

* Fix AI serialization

* Fix reaction serialization

* Fix body serialization

* Fix grid atmosphere serialization

* Rename IServ3Manager to ISerializationManager

* Convert every non generic serializer to the new format, general fixes

* Serialization and body system fix

* pushinheritance fix

* Update all prototypes to have a parent and have consistent id/parent properties

* Merge fixes

* smh my head

* cuddling slaps

* Content commit for engine PR

* stuff

* more fixes

* argh

* yes even you are fixed

* changelog fixes

* fixes seeds

* argh

* Test fixes

* Add writing for alert order prototype

* Fix alert order writing

* FIX

* its been alot ok

* Fix the rest of the visualizers

* Fix server alerts component tests

* Fix alert prototype tests not using the read value

* Fix alert prototype tests initializing serialization multiple times

* THIS IS AN AMERICAN CODEBASE GOD BLESS THE USA

* Add ImplicitDataDefinitionForInheritors to IMechanismBehavior
Fixes the behaviors not being found

* Fix NRE in strap component
Good night to the 1 buckle optimization

* Fix clothing component slot flags serialization tag

* Fix body component in all components test

* Merge fixes

* ffs

* Make construction graph prototype use serialization hooks

* human yaml linted

* a

* Do the thing for construction

* stuff

* a

* monke see yaml linter

* LINT HARDER

* Remove redundant todo

* yes

* Add skip hook argument to readers and copiers

* we gamin

* test/datafield fixes

* adds more verbose validation

* moves linter to action

* Improve construction graph step type serializer error message

* Fix ammo box component NRE

* gamin

* some updates to the linter

* yes

* removes that test

* misc fixes

* array fix
priority fix
misc fixes

* adds proper info the validation

* adds alwaysrelevant usa

* Make yaml linter take half as long to run (~50% less)

* Make yaml linter 5 times faster (~80% less execution time)

* based vera being based

* fixes mapsaving

* warning cleanup & moves surpressor

* removes old msbuild targets

* Revert "Make yaml linter 5 times faster (~80% less execution time)"

This reverts commit 3e6091359a26252c3e98828199553de668031c63.

* Add -nowarn to yaml linter run configuration

* Improve yaml linter message feedback

* Make dependencies an argument instead of a property on the serialization manager

* yamllinting slaps

* Clean up type serializers

* Move yaml linter code to its own method

* Fix yaml errors

* Change yaml linter action name and remove -nowarn

* yaml linter please shut

* Git resetti robust toolbox

Co-authored-by: Paul <ritter.paul1+git@googlemail.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
This commit is contained in:
Paul Ritter
2021-03-05 01:08:38 +01:00
committed by GitHub
parent 05d4d9692c
commit 5c50b1f6ed
545 changed files with 4547 additions and 6650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerProviderComponent.cs
View File

@@ -3,7 +3,7 @@ using System;
using System.Collections.Generic;
using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Power.ApcNetComponents
@@ -39,7 +39,8 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
public int PowerTransferRange { get => _powerTransferRange; set => SetPowerTransferRange(value); }
private int _powerTransferRange;
[DataField("powerTransferRange")]
private int _powerTransferRange = 3;
[ViewVariables]
public IReadOnlyList<PowerReceiverComponent> LinkedReceivers => _linkedReceivers;
@@ -74,12 +75,6 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents
Net.UpdatePowerProviderReceivers(this, oldLoad, newLoad);
}
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _powerTransferRange, "powerTransferRange", 3);
}
protected override void Startup()
{
base.Startup();

23
Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverComponent.cs
View File

@@ -7,7 +7,9 @@ using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
using Robust.Shared.ViewVariables;
@@ -39,7 +41,8 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
public int PowerReceptionRange { get => _powerReceptionRange; set => SetPowerReceptionRange(value); }
private int _powerReceptionRange;
[DataField("powerReceptionRange")]
private int _powerReceptionRange = 3;
[ViewVariables]
public IPowerProvider Provider { get => _provider; set => SetProvider(value); }
@@ -60,31 +63,25 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
public int Load { get => _load; set => SetLoad(value); }
private int _load;
[DataField("powerLoad")]
private int _load = 5;
/// <summary>
/// When false, causes this to appear powered even if not receiving power from an Apc.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
public bool NeedsPower { get => _needsPower; set => SetNeedsPower(value); }
private bool _needsPower;
[DataField("needsPower")]
private bool _needsPower = true;
/// <summary>
/// When true, causes this to never appear powered.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
public bool PowerDisabled { get => _powerDisabled; set => SetPowerDisabled(value); }
[DataField("powerDisabled")]
private bool _powerDisabled;
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _powerReceptionRange, "powerReceptionRange", 3);
serializer.DataField(ref _load, "powerLoad", 5);
serializer.DataField(ref _needsPower, "needsPower", true);
serializer.DataField(ref _powerDisabled, "powerDisabled", false);
}
protected override void Startup()
{
base.Startup();
@@ -98,7 +95,7 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents
}
}
public override void OnRemove()
public override void OnRemove()
{
_provider.RemoveReceiver(this);
base.OnRemove();

15
Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/BaseCharger.cs
View File

@@ -13,7 +13,9 @@ using Robust.Server.GameObjects;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.Localization;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers
@@ -32,17 +34,12 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerRece
private CellChargerStatus _status;
[ViewVariables]
private int _chargeRate;
[DataField("chargeRate")]
private int _chargeRate = 100;
[ViewVariables]
private float _transferEfficiency;
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _chargeRate, "chargeRate", 100);
serializer.DataField(ref _transferEfficiency, "transferEfficiency", 0.85f);
}
[DataField("transferEfficiency")]
private float _transferEfficiency = 0.85f;
public override void Initialize()
{

19
Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/EmergencyLightComponent.cs
View File

@@ -5,7 +5,9 @@ using Content.Shared.GameObjects.EntitySystems;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.Localization;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
using Robust.Shared.ViewVariables;
@@ -36,19 +38,14 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerRece
private EmergencyLightState _state = EmergencyLightState.Empty;
[ViewVariables(VVAccess.ReadWrite)]
private float _wattage;
[DataField("wattage")]
private float _wattage = 5;
[ViewVariables(VVAccess.ReadWrite)]
private float _chargingWattage;
[DataField("chargingWattage")]
private float _chargingWattage = 60;
[ViewVariables(VVAccess.ReadWrite)]
private float _chargingEfficiency;
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _wattage, "wattage", 5);
serializer.DataField(ref _chargingWattage, "chargingWattage", 60);
serializer.DataField(ref _chargingEfficiency, "chargingEfficiency", 0.85f);
}
[DataField("chargingEfficiency")]
private float _chargingEfficiency = 0.85f;
/// <summary>
/// For attaching UpdateState() to events.

17
Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/LightBulbComponent.cs
View File

@@ -10,6 +10,7 @@ using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers
@@ -42,6 +43,7 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerRece
public event EventHandler<EventArgs>? OnLightBulbStateChange;
public event EventHandler<EventArgs?>? OnLightColorChange;
[DataField("color")]
private Color _color = Color.White;
[ViewVariables(VVAccess.ReadWrite)] public Color Color
@@ -57,12 +59,15 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerRece
public override string Name => "LightBulb";
[DataField("bulb")]
public LightBulbType Type = LightBulbType.Tube;
private int _burningTemperature;
[DataField("BurningTemperature")]
private int _burningTemperature = 1400;
public int BurningTemperature => _burningTemperature;
private int _powerUse;
[DataField("PowerUse")]
private int _powerUse = 40;
public int PowerUse => _powerUse;
/// <summary>
@@ -94,14 +99,6 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerRece
private LightBulbState _state = LightBulbState.Normal;
public override void ExposeData(ObjectSerializer serializer)
{
serializer.DataField(ref Type, "bulb", LightBulbType.Tube);
serializer.DataField(ref _color, "color", Color.White);
serializer.DataFieldCached(ref _burningTemperature, "BurningTemperature", 1400);
serializer.DataFieldCached(ref _powerUse, "PowerUse", 40);
}
public void UpdateColor()
{
if (!Owner.TryGetComponent(out SpriteComponent? sprite))

31
Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs
View File

@@ -19,8 +19,7 @@ using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Log;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Timing;
using Robust.Shared.ViewVariables;
@@ -46,13 +45,23 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerRece
private TimeSpan _lastThunk;
private TimeSpan? _lastGhostBlink;
private bool _hasLampOnSpawn;
[ViewVariables] private bool _on;
[ViewVariables] private bool _currentLit;
[ViewVariables] private bool _isBlinking;
[ViewVariables] private bool _ignoreGhostsBoo;
[DataField("hasLampOnSpawn")]
private bool _hasLampOnSpawn = true;
[ViewVariables] [DataField("on")]
private bool _on = true;
[ViewVariables]
private bool _currentLit;
[ViewVariables]
private bool _isBlinking;
[ViewVariables] [DataField("ignoreGhostsBoo")]
private bool _ignoreGhostsBoo;
[DataField("bulb")]
private LightBulbType BulbType = LightBulbType.Tube;
[ViewVariables] private ContainerSlot _lightBulbContainer = default!;
@@ -156,14 +165,6 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerRece
bulb.Owner.Transform.Coordinates = user.Transform.Coordinates;
}
public override void ExposeData(ObjectSerializer serializer)
{
serializer.DataField(ref BulbType, "bulb", LightBulbType.Tube);
serializer.DataField(ref _on, "on", true);
serializer.DataField(ref _hasLampOnSpawn, "hasLampOnSpawn", true);
serializer.DataField(ref _ignoreGhostsBoo, "ignoreGhostsBoo", false);
}
/// <summary>
/// For attaching UpdateLight() to events.
/// </summary>

13
Content.Server/GameObjects/Components/Power/BaseNetConnectorComponent.cs
View File

@@ -1,10 +1,10 @@
#nullable enable
#nullable enable
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Server.GameObjects.Components.NodeContainer;
using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Power
@@ -13,7 +13,8 @@ namespace Content.Server.GameObjects.Components.Power
{
[ViewVariables(VVAccess.ReadWrite)]
public Voltage Voltage { get => _voltage; set => SetVoltage(value); }
private Voltage _voltage;
[DataField("voltage")]
private Voltage _voltage = Voltage.High;
[ViewVariables]
public TNetType Net { get => _net; set => SetNet(value); }
@@ -30,12 +31,6 @@ namespace Content.Server.GameObjects.Components.Power
_net = NullNet;
}
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _voltage, "voltage", Voltage.High);
}
public override void Initialize()
{
base.Initialize();

21
Content.Server/GameObjects/Components/Power/BatteryComponent.cs
View File

@@ -2,7 +2,9 @@
using System;
using Robust.Shared.GameObjects;
using Robust.Shared.Maths;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Power
@@ -16,35 +18,28 @@ namespace Content.Server.GameObjects.Components.Power
/// Maximum charge of the battery in joules (ie. watt seconds)
/// </summary>
[ViewVariables(VVAccess.ReadWrite)] public int MaxCharge { get => _maxCharge; set => SetMaxCharge(value); }
private int _maxCharge;
[DataField("maxCharge")]
private int _maxCharge = 1000;
/// <summary>
/// Current charge of the battery in joules (ie. watt seconds)
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
public float CurrentCharge { get => _currentCharge; set => SetCurrentCharge(value); }
private float _currentCharge;
[DataField("startingCharge")]
private float _currentCharge = 500;
/// <summary>
/// True if the battery is fully charged.
/// </summary>
[ViewVariables] public bool IsFullyCharged => MathHelper.CloseTo(CurrentCharge, MaxCharge);
[ViewVariables(VVAccess.ReadWrite)] public bool AutoRecharge { get; set; }
[ViewVariables(VVAccess.ReadWrite)] [DataField("autoRecharge")] public bool AutoRecharge { get; set; }
[ViewVariables(VVAccess.ReadWrite)] public float AutoRechargeRate { get; set; }
[ViewVariables(VVAccess.ReadWrite)] [DataField("autoRechargeRate")] public float AutoRechargeRate { get; set; }
[ViewVariables] public BatteryState BatteryState { get; private set; }
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _maxCharge, "maxCharge", 1000);
serializer.DataField(ref _currentCharge, "startingCharge", 500);
serializer.DataField(this, x => x.AutoRecharge, "autoRecharge", false);
serializer.DataField(this, x => x.AutoRechargeRate, "autoRechargeRate", 0);
}
public override void Initialize()
{
base.Initialize();

9
Content.Server/GameObjects/Components/Power/PowerCellComponent.cs
View File

@@ -8,7 +8,9 @@ using Content.Shared.Utility;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.Localization;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
using Robust.Shared.ViewVariables;
@@ -25,16 +27,11 @@ namespace Content.Server.GameObjects.Components.Power
public override string Name => "PowerCell";
[ViewVariables] public PowerCellSize CellSize => _cellSize;
[DataField("cellSize")]
private PowerCellSize _cellSize = PowerCellSize.Small;
[ViewVariables] public bool IsRigged { get; private set; }
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _cellSize, "cellSize", PowerCellSize.Small);
}
public override void Initialize()
{
base.Initialize();

29
Content.Server/GameObjects/Components/Power/PowerCellSlotComponent.cs
View File

@@ -10,7 +10,9 @@ using Robust.Server.GameObjects;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.Localization;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
using Robust.Shared.ViewVariables;
@@ -29,18 +31,21 @@ namespace Content.Server.GameObjects.Components.Power
/// What size of cell fits into this component.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("slotSize")]
public PowerCellSize SlotSize { get; set; } = PowerCellSize.Small;
/// <summary>
/// Can the cell be removed ?
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("canRemoveCell")]
public bool CanRemoveCell { get; set; } = true;
/// <summary>
/// Should the "Remove cell" verb be displayed on this component?
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("showVerb")]
public bool ShowVerb { get; set; } = true;
/// <summary>
@@ -49,21 +54,24 @@ namespace Content.Server.GameObjects.Components.Power
/// Use null to show no text.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
public string? DescFormatString { get; set; }
[DataField("descFormatString")]
public string? DescFormatString { get; set; } = "It uses size {0} power cells.";
/// <summary>
/// File path to a sound file that should be played when the cell is removed.
/// </summary>
/// <example>"/Audio/Items/pistol_magout.ogg"</example>
[ViewVariables(VVAccess.ReadWrite)]
public string? CellRemoveSound { get; set; }
[DataField("cellRemoveSound")]
public string? CellRemoveSound { get; set; } = "/Audio/Items/pistol_magin.ogg";
/// <summary>
/// File path to a sound file that should be played when a cell is inserted.
/// </summary>
/// <example>"/Audio/Items/pistol_magin.ogg"</example>
[ViewVariables(VVAccess.ReadWrite)]
public string? CellInsertSound { get; set; }
[DataField("cellInsertSound")]
public string? CellInsertSound { get; set; } = "/Audio/Items/pistol_magout.ogg";
[ViewVariables] private ContainerSlot _cellContainer = default!;
@@ -82,26 +90,15 @@ namespace Content.Server.GameObjects.Components.Power
/// <summary>
/// True if we don't want a cell inserted during map init.
/// </summary>
[DataField("startEmpty")]
private bool _startEmpty = false;
/// <summary>
/// If not null, this cell type will be inserted at MapInit instead of the default Standard cell.
/// </summary>
[DataField("startingCellType")]
private string? _startingCellType = null;
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(this, x => x.SlotSize, "slotSize", PowerCellSize.Small);
serializer.DataField(this, x => x.CanRemoveCell, "canRemoveCell", true);
serializer.DataField(this, x => x.ShowVerb, "showVerb", true);
serializer.DataField(ref _startEmpty, "startEmpty", false);
serializer.DataField(ref _startingCellType, "startingCellType", null);
serializer.DataField(this, x => x.CellRemoveSound, "cellRemoveSound", "/Audio/Items/pistol_magin.ogg");
serializer.DataField(this, x => x.CellInsertSound, "cellInsertSound", "/Audio/Items/pistol_magout.ogg");
serializer.DataField(this, x => x.DescFormatString, "descFormatString", "It uses size {0} power cells.");
}
public override void Initialize()
{
base.Initialize();

10
Content.Server/GameObjects/Components/Power/PowerNetComponents/BatteryDischargerComponent.cs
View File

@@ -1,6 +1,8 @@
#nullable enable
using Robust.Shared.GameObjects;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
@@ -21,13 +23,9 @@ namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
[ViewVariables(VVAccess.ReadWrite)]
public int ActiveSupplyRate { get => _activeSupplyRate; set => SetActiveSupplyRate(value); }
private int _activeSupplyRate;
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _activeSupplyRate, "activeSupplyRate", 50);
}
[DataField("activeSupplyRate")]
private int _activeSupplyRate = 50;
public override void Initialize()
{

11
Content.Server/GameObjects/Components/Power/PowerNetComponents/BatteryStorageComponent.cs
View File

@@ -1,6 +1,8 @@
#nullable enable
using Robust.Shared.GameObjects;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
@@ -15,7 +17,8 @@ namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
[ViewVariables(VVAccess.ReadWrite)]
public int ActiveDrawRate { get => _activeDrawRate; set => SetActiveDrawRate(value); }
private int _activeDrawRate;
[DataField("activeDrawRate")]
private int _activeDrawRate = 100;
[ViewVariables]
[ComponentDependency] private BatteryComponent? _battery = default!;
@@ -25,12 +28,6 @@ namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
[ComponentDependency] private PowerConsumerComponent? _consumer = default!;
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _activeDrawRate, "activeDrawRate", 100);
}
public override void Initialize()
{
base.Initialize();

13
Content.Server/GameObjects/Components/Power/PowerNetComponents/PowerConsumerComponent.cs
View File

@@ -3,7 +3,9 @@ using System;
using System.Diagnostics;
using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
using Robust.Shared.GameObjects;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
@@ -18,6 +20,7 @@ namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
public int DrawRate { get => _drawRate; set => SetDrawRate(value); }
[DataField("drawRate")]
private int _drawRate;
/// <summary>
@@ -26,7 +29,8 @@ namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
public Priority Priority { get => _priority; set => SetPriority(value); }
private Priority _priority;
[DataField("priority")]
private Priority _priority = Priority.First;
/// <summary>
/// How much power this is currently receiving from <see cref="PowerSupplierComponent"/>s.
@@ -37,13 +41,6 @@ namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
public event EventHandler<ReceivedPowerChangedEventArgs>? OnReceivedPowerChanged;
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _drawRate, "drawRate", 0);
serializer.DataField(ref _priority, "priority", Priority.First);
}
protected override void AddSelfToNet(IPowerNet powerNet)
{
powerNet.AddConsumer(this);

9
Content.Server/GameObjects/Components/Power/PowerNetComponents/PowerSupplierComponent.cs
View File

@@ -1,7 +1,9 @@
#nullable enable
using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
using Robust.Shared.GameObjects;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
@@ -13,14 +15,9 @@ namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
[ViewVariables(VVAccess.ReadWrite)]
public int SupplyRate { get => _supplyRate; set => SetSupplyRate(value); }
[DataField("supplyRate")]
private int _supplyRate;
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _supplyRate, "supplyRate", 0);
}
protected override void AddSelfToNet(IPowerNet powerNet)
{
powerNet.AddSupplier(this);

10
Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarPanelComponent.cs
View File

@@ -4,7 +4,7 @@ using Content.Server.GameObjects.EntitySystems;
using Content.Shared.GameObjects.EntitySystems;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Timing;
using Robust.Shared.ViewVariables;
@@ -23,6 +23,7 @@ namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
/// <summary>
/// Maximum supply output by this panel (coverage = 1)
/// </summary>
[DataField("maxsupply")]
private int _maxSupply = 1500;
[ViewVariables(VVAccess.ReadWrite)]
public int MaxSupply
@@ -78,13 +79,6 @@ namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
UpdateSupply();
}
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _maxSupply, "maxsupply", 1500);
}
public void OnBreak(BreakageEventArgs args)
{
if (!Owner.TryGetComponent<SpriteComponent>(out var sprite))

15
Content.Server/GameObjects/Components/Power/WireComponent.cs
View File

@@ -5,7 +5,9 @@ using Content.Server.GameObjects.Components.Stack;
using Content.Shared.GameObjects.Components.Interactable;
using Content.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Power
@@ -19,7 +21,8 @@ namespace Content.Server.GameObjects.Components.Power
public override string Name => "Wire";
[ViewVariables]
private string? _wireDroppedOnCutPrototype;
[DataField("wireDroppedOnCutPrototype")]
private string? _wireDroppedOnCutPrototype = "HVWireStack1";
/// <summary>
/// Checked by <see cref="WirePlacerComponent"/> to determine if there is
@@ -27,14 +30,8 @@ namespace Content.Server.GameObjects.Components.Power
/// </summary>
[ViewVariables]
public WireType WireType => _wireType;
private WireType _wireType;
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _wireDroppedOnCutPrototype, "wireDroppedOnCutPrototype", "HVWireStack1");
serializer.DataField(ref _wireType, "wireType", WireType.HighVoltage);
}
[DataField("wireType")]
private WireType _wireType = WireType.HighVoltage;
async Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs)
{

15
Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs
View File

@@ -7,6 +7,8 @@ using Robust.Shared.IoC;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
using System.Threading.Tasks;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Map;
namespace Content.Server.GameObjects.Components.Power
@@ -20,17 +22,12 @@ namespace Content.Server.GameObjects.Components.Power
public override string Name => "WirePlacer";
[ViewVariables]
private string? _wirePrototypeID;
[DataField("wirePrototypeID")]
private string? _wirePrototypeID = "HVWire";
[ViewVariables]
private WireType _blockingWireType;
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _wirePrototypeID, "wirePrototypeID", "HVWire");
serializer.DataField(ref _blockingWireType, "blockingWireType", WireType.HighVoltage);
}
[DataField("blockingWireType")]
private WireType _blockingWireType = WireType.HighVoltage;
/// <inheritdoc />
async Task<bool> IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs)