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

Clean up all missing EntitySystem proxy method uses (#38353)

Browse Source
This commit is contained in:
Tayrtahn
2025-06-26 19:50:49 -04:00
committed by GitHub
parent 73df3b1593
commit 75db49f9c0
185 changed files with 418 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs
View File

@@ -80,7 +80,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
private void OnPowerMonitoringConsoleMessage(EntityUid uid, PowerMonitoringConsoleComponent component, PowerMonitoringConsoleMessage args)
{
var focus = EntityManager.GetEntity(args.FocusDevice);
var focus = GetEntity(args.FocusDevice);
var group = args.FocusGroup;
// Update this if the focus device has changed
@@ -207,17 +207,17 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
if (!args.Anchored)
{
entConsole.PowerMonitoringDeviceMetaData.Remove(EntityManager.GetNetEntity(uid));
entConsole.PowerMonitoringDeviceMetaData.Remove(GetNetEntity(uid));
Dirty(ent, entConsole);
continue;
}
var name = MetaData(uid).EntityName;
var coords = EntityManager.GetNetCoordinates(xform.Coordinates);
var coords = GetNetCoordinates(xform.Coordinates);
var metaData = new PowerMonitoringDeviceMetaData(name, coords, component.Group, component.SpritePath, component.SpriteState);
entConsole.PowerMonitoringDeviceMetaData.TryAdd(EntityManager.GetNetEntity(uid), metaData);
entConsole.PowerMonitoringDeviceMetaData.TryAdd(GetNetEntity(uid), metaData);
Dirty(ent, entConsole);
}
@@ -364,7 +364,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
continue;
// Generate a new console entry with which to populate the UI
var entry = new PowerMonitoringConsoleEntry(EntityManager.GetNetEntity(ent), device.Group, powerStats.PowerValue, powerStats.BatteryLevel);
var entry = new PowerMonitoringConsoleEntry(GetNetEntity(ent), device.Group, powerStats.PowerValue, powerStats.BatteryLevel);
allEntries.Add(entry);
}
@@ -548,7 +548,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
continue;
}
indexedSources.Add(ent, new PowerMonitoringConsoleEntry(EntityManager.GetNetEntity(ent), entDevice.Group, powerSupplier.CurrentSupply, GetBatteryLevel(ent)));
indexedSources.Add(ent, new PowerMonitoringConsoleEntry(GetNetEntity(ent), entDevice.Group, powerSupplier.CurrentSupply, GetBatteryLevel(ent)));
}
}
@@ -578,7 +578,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
continue;
}
indexedSources.Add(ent, new PowerMonitoringConsoleEntry(EntityManager.GetNetEntity(ent), entDevice.Group, entBattery.CurrentSupply, GetBatteryLevel(ent)));
indexedSources.Add(ent, new PowerMonitoringConsoleEntry(GetNetEntity(ent), entDevice.Group, entBattery.CurrentSupply, GetBatteryLevel(ent)));
}
}
@@ -662,7 +662,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
continue;
}
indexedLoads.Add(ent, new PowerMonitoringConsoleEntry(EntityManager.GetNetEntity(ent), entDevice.Group, powerConsumer.ReceivedPower, GetBatteryLevel(ent)));
indexedLoads.Add(ent, new PowerMonitoringConsoleEntry(GetNetEntity(ent), entDevice.Group, powerConsumer.ReceivedPower, GetBatteryLevel(ent)));
}
}
@@ -692,7 +692,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
continue;
}
indexedLoads.Add(ent, new PowerMonitoringConsoleEntry(EntityManager.GetNetEntity(ent), entDevice.Group, battery.CurrentReceiving, GetBatteryLevel(ent)));
indexedLoads.Add(ent, new PowerMonitoringConsoleEntry(GetNetEntity(ent), entDevice.Group, battery.CurrentReceiving, GetBatteryLevel(ent)));
}
}
@@ -831,7 +831,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
private void UpdateCollectionChildMetaData(EntityUid child, EntityUid master)
{
var netEntity = EntityManager.GetNetEntity(child);
var netEntity = GetNetEntity(child);
var xform = Transform(child);
var query = AllEntityQuery<PowerMonitoringConsoleComponent, TransformComponent>();
@@ -843,7 +843,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
if (!entConsole.PowerMonitoringDeviceMetaData.TryGetValue(netEntity, out var metaData))
continue;
metaData.CollectionMaster = EntityManager.GetNetEntity(master);
metaData.CollectionMaster = GetNetEntity(master);
entConsole.PowerMonitoringDeviceMetaData[netEntity] = metaData;
Dirty(ent, entConsole);
@@ -852,7 +852,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
private void UpdateCollectionMasterMetaData(EntityUid master, int childCount)
{
var netEntity = EntityManager.GetNetEntity(master);
var netEntity = GetNetEntity(master);
var xform = Transform(master);
var query = AllEntityQuery<PowerMonitoringConsoleComponent, TransformComponent>();
@@ -960,9 +960,9 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
if (grid != entXform.GridUid)
continue;
var netEntity = EntityManager.GetNetEntity(ent);
var netEntity = GetNetEntity(ent);
var name = MetaData(ent).EntityName;
var netCoords = EntityManager.GetNetCoordinates(entXform.Coordinates);
var netCoords = GetNetCoordinates(entXform.Coordinates);
var metaData = new PowerMonitoringDeviceMetaData(name, netCoords, entDevice.Group, entDevice.SpritePath, entDevice.SpriteState);
@@ -970,7 +970,7 @@ internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitori
{
if (!entDevice.IsCollectionMaster)
{
metaData.CollectionMaster = EntityManager.GetNetEntity(entDevice.CollectionMaster);
metaData.CollectionMaster = GetNetEntity(entDevice.CollectionMaster);
}
else if (entDevice.ChildDevices.Count > 0)