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

Remove 700 usages of Component.Owner (#21100)

Browse Source
This commit is contained in:
DrSmugleaf
2023-10-19 12:34:31 -07:00
committed by GitHub
parent 5825ffb95c
commit f560f88eb5
261 changed files with 2291 additions and 2036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
Content.Server/Gravity/GravityGeneratorSystem.cs
View File

@@ -1,13 +1,12 @@
using Content.Server.Administration.Logs;
using Content.Server.Audio;
using Content.Server.Construction;
using Content.Server.Power.Components;
using Content.Shared.Database;
using Content.Shared.Gravity;
using Content.Shared.Interaction;
using Robust.Server.GameObjects;
using Robust.Server.Player;
using Robust.Shared.Players;
using Content.Server.Construction;
namespace Content.Server.Gravity
{
@@ -56,9 +55,10 @@ namespace Content.Server.Gravity
{
base.Update(frameTime);
foreach (var (gravGen, powerReceiver) in EntityManager
.EntityQuery<GravityGeneratorComponent, ApcPowerReceiverComponent>())
var query = EntityQueryEnumerator<GravityGeneratorComponent, ApcPowerReceiverComponent>();
while (query.MoveNext(out var uid, out var gravGen, out var powerReceiver))
{
var ent = (uid, gravGen, powerReceiver);
if (!gravGen.Intact)
continue;
@@ -108,15 +108,15 @@ namespace Content.Server.Gravity
var updateUI = gravGen.NeedUIUpdate;
if (!MathHelper.CloseTo(lastCharge, gravGen.Charge))
{
UpdateState(gravGen, powerReceiver);
UpdateState(ent);
updateUI = true;
}
if (updateUI)
UpdateUI(gravGen, powerReceiver, chargeRate);
UpdateUI(ent, chargeRate);
if (active != gravGen.GravityActive &&
TryComp<TransformComponent>(gravGen.Owner, out var xform) &&
TryComp<TransformComponent>(uid, out var xform) &&
TryComp<GravityComponent>(xform.ParentUid, out var gravity))
{
// Force it on in the faster path.
@@ -153,12 +153,10 @@ namespace Content.Server.Gravity
powerReceiver.Load = component.SwitchedOn ? component.ActivePowerUse : component.IdlePowerUse;
}
private void UpdateUI(
GravityGeneratorComponent component,
ApcPowerReceiverComponent powerReceiver,
float chargeRate)
private void UpdateUI(Entity<GravityGeneratorComponent, ApcPowerReceiverComponent> ent, float chargeRate)
{
if (!_uiSystem.IsUiOpen(component.Owner, SharedGravityGeneratorComponent.GravityGeneratorUiKey.Key))
var (_, component, powerReceiver) = ent;
if (!_uiSystem.IsUiOpen(ent, SharedGravityGeneratorComponent.GravityGeneratorUiKey.Key))
return;
var chargeTarget = chargeRate < 0 ? 0 : component.MaxCharge;
@@ -194,21 +192,21 @@ namespace Content.Server.Gravity
);
_uiSystem.TrySetUiState(
component.Owner,
ent,
SharedGravityGeneratorComponent.GravityGeneratorUiKey.Key,
state);
component.NeedUIUpdate = false;
}
private void OnCompInit(EntityUid uid, GravityGeneratorComponent component, ComponentInit args)
private void OnCompInit(Entity<GravityGeneratorComponent> ent, ref ComponentInit args)
{
ApcPowerReceiverComponent? powerReceiver = null;
if (!Resolve(uid, ref powerReceiver, false))
if (!Resolve(ent, ref powerReceiver, false))
return;
UpdatePowerState(component, powerReceiver);
UpdateState(component, powerReceiver);
UpdatePowerState(ent, powerReceiver);
UpdateState((ent, ent.Comp, powerReceiver));
}
private void OnInteractHand(EntityUid uid, GravityGeneratorComponent component, InteractHandEvent args)
@@ -228,9 +226,9 @@ namespace Content.Server.Gravity
component.NeedUIUpdate = true;
}
public void UpdateState(GravityGeneratorComponent grav, ApcPowerReceiverComponent powerReceiver)
public void UpdateState(Entity<GravityGeneratorComponent, ApcPowerReceiverComponent> ent)
{
var uid = grav.Owner;
var (uid, grav, powerReceiver) = ent;
var appearance = EntityManager.GetComponentOrNull<AppearanceComponent>(uid);
_appearance.SetData(uid, GravityGeneratorVisuals.Charge, grav.Charge, appearance);
@@ -242,19 +240,19 @@ namespace Content.Server.Gravity
if (!grav.Intact)
{
MakeBroken(uid, grav, appearance);
MakeBroken((uid, grav), appearance);
}
else if (powerReceiver.PowerReceived < grav.IdlePowerUse)
{
MakeUnpowered(uid, grav, appearance);
MakeUnpowered((uid, grav), appearance);
}
else if (!grav.SwitchedOn)
{
MakeOff(uid, grav, appearance);
MakeOff((uid, grav), appearance);
}
else
{
MakeOn(uid, grav, appearance);
MakeOn((uid, grav), appearance);
}
}
@@ -264,32 +262,32 @@ namespace Content.Server.Gravity
component.MaxCharge = maxChargeMultipler * 1;
}
private void MakeBroken(EntityUid uid, GravityGeneratorComponent component, AppearanceComponent? appearance)
private void MakeBroken(Entity<GravityGeneratorComponent> ent, AppearanceComponent? appearance)
{
_ambientSoundSystem.SetAmbience(component.Owner, false);
_ambientSoundSystem.SetAmbience(ent, false);
_appearance.SetData(uid, GravityGeneratorVisuals.State, GravityGeneratorStatus.Broken);
_appearance.SetData(ent, GravityGeneratorVisuals.State, GravityGeneratorStatus.Broken);
}
private void MakeUnpowered(EntityUid uid, GravityGeneratorComponent component, AppearanceComponent? appearance)
private void MakeUnpowered(Entity<GravityGeneratorComponent> ent, AppearanceComponent? appearance)
{
_ambientSoundSystem.SetAmbience(component.Owner, false);
_ambientSoundSystem.SetAmbience(ent, false);
_appearance.SetData(uid, GravityGeneratorVisuals.State, GravityGeneratorStatus.Unpowered, appearance);
_appearance.SetData(ent, GravityGeneratorVisuals.State, GravityGeneratorStatus.Unpowered, appearance);
}
private void MakeOff(EntityUid uid, GravityGeneratorComponent component, AppearanceComponent? appearance)
private void MakeOff(Entity<GravityGeneratorComponent> ent, AppearanceComponent? appearance)
{
_ambientSoundSystem.SetAmbience(component.Owner, false);
_ambientSoundSystem.SetAmbience(ent, false);
_appearance.SetData(uid, GravityGeneratorVisuals.State, GravityGeneratorStatus.Off, appearance);
_appearance.SetData(ent, GravityGeneratorVisuals.State, GravityGeneratorStatus.Off, appearance);
}
private void MakeOn(EntityUid uid, GravityGeneratorComponent component, AppearanceComponent? appearance)
private void MakeOn(Entity<GravityGeneratorComponent> ent, AppearanceComponent? appearance)
{
_ambientSoundSystem.SetAmbience(component.Owner, true);
_ambientSoundSystem.SetAmbience(ent, true);
_appearance.SetData(uid, GravityGeneratorVisuals.State, GravityGeneratorStatus.On, appearance);
_appearance.SetData(ent, GravityGeneratorVisuals.State, GravityGeneratorStatus.On, appearance);
}
private void OnSwitchGenerator(