tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove PA component references (#15252)

Browse Source
This commit is contained in:
DrSmugleaf
2023-04-09 21:10:33 -07:00
committed by GitHub
parent f8cef464a2
commit 39f272fa5c
11 changed files with 49 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs
View File

@@ -7,15 +7,15 @@ using Content.Server.Power.Components;
using Content.Server.Power.EntitySystems;
using Content.Server.UserInterface;
using Content.Shared.Database;
// using Content.Server.WireHacking;
using Content.Shared.Singularity.Components;
using Robust.Server.GameObjects;
using Robust.Server.Player;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
using Robust.Shared.Utility;
// using static Content.Shared.Wires.SharedWiresComponent;
using Timer = Robust.Shared.Timing.Timer;
// using Content.Server.WireHacking;
// using static Content.Shared.Wires.SharedWiresComponent;
namespace Content.Server.ParticleAccelerator.Components
{
@@ -191,7 +191,8 @@ namespace Content.Server.ParticleAccelerator.Components
Master = null;
foreach (var part in AllParts())
{
part.Master = null;
if (_entMan.TryGetComponent(part.Owner, out ParticleAcceleratorPartComponent? paPart))
paPart.Master = null;
}
base.OnRemove();
@@ -322,7 +323,8 @@ namespace Content.Server.ParticleAccelerator.Components
SwitchOff(playerSession, true);
foreach (var part in AllParts())
{
part.Master = null;
if (_entMan.TryGetComponent(part.Owner, out ParticleAcceleratorPartComponent? paPart))
paPart.Master = null;
}
_isAssembled = false;
@@ -395,7 +397,8 @@ namespace Content.Server.ParticleAccelerator.Components
foreach (var part in AllParts())
{
part.Master = this;
if (_entMan.TryGetComponent(part.Owner, out ParticleAcceleratorPartComponent? paPart))
paPart.Master = this;
}
UpdateUI();
@@ -408,7 +411,7 @@ namespace Content.Server.ParticleAccelerator.Components
}
private bool ScanPart<T>(Vector2i offset, [NotNullWhen(true)] out T? part)
where T : ParticleAcceleratorPartComponent
where T : Component
{
var xform = _entMan.GetComponent<TransformComponent>(Owner);
if (!_mapManager.TryGetGrid(xform.GridUid, out var grid))
@@ -430,7 +433,7 @@ namespace Content.Server.ParticleAccelerator.Components
return false;
}
private IEnumerable<ParticleAcceleratorPartComponent> AllParts()
private IEnumerable<Component> AllParts()
{
if (_partFuelChamber != null)
yield return _partFuelChamber;
@@ -668,7 +671,7 @@ namespace Content.Server.ParticleAccelerator.Components
//no endcap because it has no powerlevel-sprites
}
private void UpdatePartVisualState(ParticleAcceleratorPartComponent? component)
private void UpdatePartVisualState(Component? component)
{
if (component == null || !_entMan.TryGetComponent<AppearanceComponent?>(component.Owner, out var appearanceComponent))
{
@@ -681,12 +684,6 @@ namespace Content.Server.ParticleAccelerator.Components
appearanceComponent.SetData(ParticleAcceleratorVisuals.VisualState, state);
}
public override void Moved()
{
// We rotate OURSELVES when scanning for parts, so don't actually run rescan on rotate.
// That would be silly.
}
public enum ParticleAcceleratorControlBoxWires
{
/// <summary>

3
Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEmitterComponent.cs
View File

@@ -3,8 +3,7 @@
namespace Content.Server.ParticleAccelerator.Components
{
[RegisterComponent]
[ComponentReference(typeof(ParticleAcceleratorPartComponent))]
public sealed class ParticleAcceleratorEmitterComponent : ParticleAcceleratorPartComponent
public sealed class ParticleAcceleratorEmitterComponent : Component
{
[DataField("emitterType")]
public ParticleAcceleratorEmitterType Type = ParticleAcceleratorEmitterType.Center;

8
Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEndCapComponent.cs
View File

@@ -1,8 +1,6 @@
namespace Content.Server.ParticleAccelerator.Components
{
namespace Content.Server.ParticleAccelerator.Components;
[RegisterComponent]
[ComponentReference(typeof(ParticleAcceleratorPartComponent))]
public sealed class ParticleAcceleratorEndCapComponent : ParticleAcceleratorPartComponent
public sealed class ParticleAcceleratorEndCapComponent : Component
{
}
}

8
Content.Server/ParticleAccelerator/Components/ParticleAcceleratorFuelChamberComponent.cs
View File

@@ -1,8 +1,6 @@
namespace Content.Server.ParticleAccelerator.Components
{
namespace Content.Server.ParticleAccelerator.Components;
[RegisterComponent]
[ComponentReference(typeof(ParticleAcceleratorPartComponent))]
public sealed class ParticleAcceleratorFuelChamberComponent : ParticleAcceleratorPartComponent
public sealed class ParticleAcceleratorFuelChamberComponent : Component
{
}
}

6
Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPartComponent.cs
View File

@@ -1,6 +1,8 @@
namespace Content.Server.ParticleAccelerator.Components
{
public abstract class ParticleAcceleratorPartComponent : Component
[RegisterComponent]
[Virtual]
public class ParticleAcceleratorPartComponent : Component
{
[ViewVariables] public ParticleAcceleratorControlBoxComponent? Master;
@@ -29,7 +31,7 @@ namespace Content.Server.ParticleAccelerator.Components
Master?.RescanParts();
}
public virtual void Moved()
public void Moved()
{
RescanIfPossible();
}

8
Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs
View File

@@ -1,10 +1,9 @@
using Content.Server.Power.Components;
namespace Content.Server.ParticleAccelerator.Components
{
namespace Content.Server.ParticleAccelerator.Components;
[RegisterComponent]
[ComponentReference(typeof(ParticleAcceleratorPartComponent))]
public sealed class ParticleAcceleratorPowerBoxComponent : ParticleAcceleratorPartComponent
public sealed class ParticleAcceleratorPowerBoxComponent : Component
{
[ViewVariables] public PowerConsumerComponent? PowerConsumerComponent;
@@ -15,4 +14,3 @@ namespace Content.Server.ParticleAccelerator.Components
PowerConsumerComponent = Owner.EnsureComponentWarn<PowerConsumerComponent>();
}
}
}

5
Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.PowerBox.cs
View File

@@ -10,12 +10,13 @@ namespace Content.Server.ParticleAccelerator.EntitySystems
SubscribeLocalEvent<ParticleAcceleratorPowerBoxComponent, PowerConsumerReceivedChanged>(PowerBoxReceivedChanged);
}
private static void PowerBoxReceivedChanged(
private void PowerBoxReceivedChanged(
EntityUid uid,
ParticleAcceleratorPowerBoxComponent component,
ref PowerConsumerReceivedChanged args)
{
component.Master?.PowerBoxReceivedChanged(args);
if (TryComp(uid, out ParticleAcceleratorPartComponent? paPart))
paPart.Master?.PowerBoxReceivedChanged(args);
}
}
}

3
Resources/Prototypes/Entities/Structures/Power/Generation/PA/emitter.yml
View File

@@ -17,6 +17,7 @@
visuals:
- type: ParticleAcceleratorPartVisualizer
baseState: unlit
- type: ParticleAcceleratorPart
- type: ParticleAcceleratorEmitter
emitterType: Left
- type: Construction
@@ -45,6 +46,7 @@
visuals:
- type: ParticleAcceleratorPartVisualizer
baseState: unlit
- type: ParticleAcceleratorPart
- type: ParticleAcceleratorEmitter
emitterType: Center
- type: Construction
@@ -72,6 +74,7 @@
visuals:
- type: ParticleAcceleratorPartVisualizer
baseState: unlit
- type: ParticleAcceleratorPart
- type: ParticleAcceleratorEmitter
emitterType: Right
- type: Construction

1
Resources/Prototypes/Entities/Structures/Power/Generation/PA/end_cap.yml
View File

@@ -7,6 +7,7 @@
- type: Sprite
sprite: Structures/Power/Generation/PA/end_cap.rsi
state: capc
- type: ParticleAcceleratorPart
- type: ParticleAcceleratorEndCap
- type: Construction
graph: ParticleAcceleratorEndCap

1
Resources/Prototypes/Entities/Structures/Power/Generation/PA/fuel_chamber.yml
View File

@@ -17,6 +17,7 @@
visuals:
- type: ParticleAcceleratorPartVisualizer
baseState: unlit
- type: ParticleAcceleratorPart
- type: ParticleAcceleratorFuelChamber
- type: Construction
graph: ParticleAcceleratorFuelChamber

1
Resources/Prototypes/Entities/Structures/Power/Generation/PA/power_box.yml
View File

@@ -17,6 +17,7 @@
visuals:
- type: ParticleAcceleratorPartVisualizer
baseState: unlit
- type: ParticleAcceleratorPart
- type: ParticleAcceleratorPowerBox
- type: PowerConsumer
voltage: High