Updates the content components to be compatible with the changes in 55a50ff7ba.

Updates engine submodule.
This commit is contained in:
Acruid
2019-09-18 11:29:12 -07:00
parent 364279e0f7
commit dd06c71735
13 changed files with 41 additions and 25 deletions

View File

@@ -75,7 +75,8 @@ namespace Content.Client.GameObjects.Components.IconSmoothing
serializer.DataFieldCached(ref _mode, "mode", IconSmoothingMode.Corners); serializer.DataFieldCached(ref _mode, "mode", IconSmoothingMode.Corners);
} }
public override void Startup() /// <inheritdoc />
protected override void Startup()
{ {
base.Startup(); base.Startup();
@@ -196,7 +197,8 @@ namespace Content.Client.GameObjects.Components.IconSmoothing
Sprite.LayerSetState(CornerLayers.NW, $"{StateBase}{(int) cornerNW}"); Sprite.LayerSetState(CornerLayers.NW, $"{StateBase}{(int) cornerNW}");
} }
public override void Shutdown() /// <inheritdoc />
protected override void Shutdown()
{ {
SnapGrid.OnPositionChanged -= SnapGridOnPositionChanged; SnapGrid.OnPositionChanged -= SnapGridOnPositionChanged;
Owner.EntityManager.RaiseEvent(Owner, new IconSmoothDirtyEvent(_lastPosition, SnapGrid.Offset, Mode)); Owner.EntityManager.RaiseEvent(Owner, new IconSmoothDirtyEvent(_lastPosition, SnapGrid.Offset, Mode));

View File

@@ -1,4 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using Content.Client.GameObjects.Components.IconSmoothing; using Content.Client.GameObjects.Components.IconSmoothing;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
@@ -26,7 +26,8 @@ namespace Content.Client.GameObjects.Components
public CornerFill LastCornerSW { get; private set; } public CornerFill LastCornerSW { get; private set; }
public CornerFill LastCornerNW { get; private set; } public CornerFill LastCornerNW { get; private set; }
public override void Startup() /// <inheritdoc />
protected override void Startup()
{ {
base.Startup(); base.Startup();

View File

@@ -1,4 +1,4 @@
using Content.Shared.Maps; using Content.Shared.Maps;
using Robust.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.Transform; using Robust.Shared.GameObjects.Components.Transform;
@@ -24,7 +24,8 @@ namespace Content.Client.GameObjects.Components
_snapGridComponent = Owner.GetComponent<SnapGridComponent>(); _snapGridComponent = Owner.GetComponent<SnapGridComponent>();
} }
public override void Startup() /// <inheritdoc />
protected override void Startup()
{ {
base.Startup(); base.Startup();
@@ -32,7 +33,8 @@ namespace Content.Client.GameObjects.Components
Owner.EntityManager.RaiseEvent(Owner, new SubFloorHideDirtyEvent()); Owner.EntityManager.RaiseEvent(Owner, new SubFloorHideDirtyEvent());
} }
public override void Shutdown() /// <inheritdoc />
protected override void Shutdown()
{ {
base.Shutdown(); base.Shutdown();

View File

@@ -1,4 +1,4 @@
using Content.Client.GameObjects.EntitySystems; using Content.Client.GameObjects.EntitySystems;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
@@ -25,7 +25,8 @@ namespace Content.Client.GameObjects.Components
_snapGrid = Owner.GetComponent<SnapGridComponent>(); _snapGrid = Owner.GetComponent<SnapGridComponent>();
} }
public override void Startup() /// <inheritdoc />
protected override void Startup()
{ {
base.Startup(); base.Startup();
@@ -43,7 +44,8 @@ namespace Content.Client.GameObjects.Components
_sprite.LayerSetDirOffset(CornerLayers.SW, SpriteComponent.DirectionOffset.Clockwise); _sprite.LayerSetDirOffset(CornerLayers.SW, SpriteComponent.DirectionOffset.Clockwise);
} }
public override void Shutdown() /// <inheritdoc />
protected override void Shutdown()
{ {
_snapGrid.OnPositionChanged -= SnapGridOnPositionChanged; _snapGrid.OnPositionChanged -= SnapGridOnPositionChanged;

View File

@@ -21,7 +21,7 @@ namespace Content.Server.GameObjects.Components.Power
{ {
public override string Name => "PowerDevice"; public override string Name => "PowerDevice";
public override void Startup() protected override void Startup()
{ {
base.Startup(); base.Startup();
if (_drawType != DrawTypes.Node) if (_drawType != DrawTypes.Node)
@@ -161,7 +161,8 @@ namespace Content.Server.GameObjects.Components.Power
} }
} }
public override void Shutdown() /// <inheritdoc />
protected override void Shutdown()
{ {
if (Owner.TryGetComponent(out PowerNodeComponent node)) if (Owner.TryGetComponent(out PowerNodeComponent node))
{ {

View File

@@ -97,7 +97,8 @@ namespace Content.Server.GameObjects.Components.Power
Load = 0; Load = 0;
} }
public override void Shutdown() /// <inheritdoc />
protected override void Shutdown()
{ {
base.Shutdown(); base.Shutdown();

View File

@@ -1,4 +1,4 @@
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Shared.GameObjects.Components.Research; using Content.Shared.GameObjects.Components.Research;
using Robust.Server.GameObjects.Components.UserInterface; using Robust.Server.GameObjects.Components.UserInterface;
using Robust.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.GameObjects;
@@ -99,7 +99,8 @@ namespace Content.Server.GameObjects.Components.Research
} }
} }
public override void Shutdown() /// <inheritdoc />
protected override void Shutdown()
{ {
base.Shutdown(); base.Shutdown();
UnregisterFromServer(); UnregisterFromServer();

View File

@@ -1,4 +1,4 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.InteropServices.WindowsRuntime; using System.Runtime.InteropServices.WindowsRuntime;
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
@@ -71,7 +71,8 @@ namespace Content.Server.GameObjects.Components.Research
Database = Owner.GetComponent<TechnologyDatabaseComponent>(); Database = Owner.GetComponent<TechnologyDatabaseComponent>();
} }
public override void Shutdown() /// <inheritdoc />
protected override void Shutdown()
{ {
base.Shutdown(); base.Shutdown();
IoCManager.Resolve<IEntitySystemManager>()?.GetEntitySystem<ResearchSystem>()?.UnregisterServer(this); IoCManager.Resolve<IEntitySystemManager>()?.GetEntitySystem<ResearchSystem>()?.UnregisterServer(this);

View File

@@ -1,4 +1,4 @@
using System; using System;
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
@@ -65,7 +65,8 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile
_appearance = Owner.GetComponent<AppearanceComponent>(); _appearance = Owner.GetComponent<AppearanceComponent>();
} }
public override void Startup() /// <inheritdoc />
protected override void Startup()
{ {
base.Startup(); base.Startup();

View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Shared.GameObjects.Components.Weapons.Ranged; using Content.Shared.GameObjects.Components.Weapons.Ranged;
@@ -58,7 +58,8 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile
_appearance = Owner.GetComponent<AppearanceComponent>(); _appearance = Owner.GetComponent<AppearanceComponent>();
} }
public override void Startup() /// <inheritdoc />
protected override void Startup()
{ {
base.Startup(); base.Startup();

View File

@@ -84,7 +84,8 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile
_appearance = Owner.GetComponent<AppearanceComponent>(); _appearance = Owner.GetComponent<AppearanceComponent>();
} }
public override void Startup() /// <inheritdoc />
protected override void Startup()
{ {
base.Startup(); base.Startup();

View File

@@ -71,14 +71,16 @@ namespace Content.Shared.GameObjects.Components.Chemistry
serializer.DataField(ref _capabilities, "caps", SolutionCaps.None); serializer.DataField(ref _capabilities, "caps", SolutionCaps.None);
} }
public override void Startup() /// <inheritdoc />
protected override void Startup()
{ {
base.Startup(); base.Startup();
RecalculateColor(); RecalculateColor();
} }
public override void Shutdown() /// <inheritdoc />
protected override void Shutdown()
{ {
base.Shutdown(); base.Shutdown();