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

Content update for NetEntities (#18935)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-11 09:42:41 +10:00
committed by GitHub
parent 389c8d1a2c
commit 5a0fc68be2
526 changed files with 3058 additions and 2215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Content.Server/Construction/Commands/FixRotationsCommand.cs
View File

@@ -10,8 +10,11 @@ using Robust.Shared.Map;
namespace Content.Server.Construction.Commands
{
[AdminCommand(AdminFlags.Mapping)]
sealed class FixRotationsCommand : IConsoleCommand
public sealed class FixRotationsCommand : IConsoleCommand
{
[Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private readonly IMapManager _mapManager = default!;
// ReSharper disable once StringLiteralTypo
public string Command => "fixrotations";
public string Description => "Sets the rotation of all occluders, low walls and windows to south.";
@@ -20,9 +23,8 @@ namespace Content.Server.Construction.Commands
public void Execute(IConsoleShell shell, string argsOther, string[] args)
{
var player = shell.Player as IPlayerSession;
var entityManager = IoCManager.Resolve<IEntityManager>();
EntityUid? gridId;
var xformQuery = entityManager.GetEntityQuery<TransformComponent>();
var xformQuery = _entManager.GetEntityQuery<TransformComponent>();
switch (args.Length)
{
@@ -36,7 +38,7 @@ namespace Content.Server.Construction.Commands
gridId = xformQuery.GetComponent(playerEntity).GridUid;
break;
case 1:
if (!EntityUid.TryParse(args[0], out var id))
if (!NetEntity.TryParse(args[0], out var idNet) || !_entManager.TryGetEntity(idNet, out var id))
{
shell.WriteError($"{args[0]} is not a valid entity.");
return;
@@ -49,25 +51,24 @@ namespace Content.Server.Construction.Commands
return;
}
var mapManager = IoCManager.Resolve<IMapManager>();
if (!mapManager.TryGetGrid(gridId, out var grid))
if (!_mapManager.TryGetGrid(gridId, out var grid))
{
shell.WriteError($"No grid exists with id {gridId}");
return;
}
if (!entityManager.EntityExists(grid.Owner))
if (!_entManager.EntityExists(grid.Owner))
{
shell.WriteError($"Grid {gridId} doesn't have an associated grid entity.");
return;
}
var changed = 0;
var tagSystem = entityManager.EntitySysManager.GetEntitySystem<TagSystem>();
var tagSystem = _entManager.EntitySysManager.GetEntitySystem<TagSystem>();
foreach (var child in xformQuery.GetComponent(grid.Owner).ChildEntities)
{
if (!entityManager.EntityExists(child))
if (!_entManager.EntityExists(child))
{
continue;
}
@@ -76,14 +77,14 @@ namespace Content.Server.Construction.Commands
// Occluders should only count if the state of it right now is enabled.
// This prevents issues with edge firelocks.
if (entityManager.TryGetComponent<OccluderComponent>(child, out var occluder))
if (_entManager.TryGetComponent<OccluderComponent>(child, out var occluder))
{
valid |= occluder.Enabled;
}
// low walls & grilles
valid |= entityManager.HasComponent<SharedCanBuildWindowOnTopComponent>(child);
valid |= _entManager.HasComponent<SharedCanBuildWindowOnTopComponent>(child);
// cables
valid |= entityManager.HasComponent<CableComponent>(child);
valid |= _entManager.HasComponent<CableComponent>(child);
// anything else that might need this forced
valid |= tagSystem.HasTag(child, "ForceFixRotations");
// override

20
Content.Server/Construction/Commands/TileReplaceCommand.cs
View File

@@ -9,6 +9,10 @@ namespace Content.Server.Construction.Commands;
[AdminCommand(AdminFlags.Mapping)]
sealed class TileReplaceCommand : IConsoleCommand
{
[Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly ITileDefinitionManager _tileDef = default!;
// ReSharper disable once StringLiteralTypo
public string Command => "tilereplace";
public string Description => "Replaces one tile with another.";
@@ -17,7 +21,6 @@ sealed class TileReplaceCommand : IConsoleCommand
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var player = shell.Player as IPlayerSession;
var entityManager = IoCManager.Resolve<IEntityManager>();
EntityUid? gridId;
string tileIdA;
string tileIdB;
@@ -31,12 +34,13 @@ sealed class TileReplaceCommand : IConsoleCommand
return;
}
gridId = entityManager.GetComponent<TransformComponent>(playerEntity).GridUid;
gridId = _entManager.GetComponent<TransformComponent>(playerEntity).GridUid;
tileIdA = args[0];
tileIdB = args[1];
break;
case 3:
if (!EntityUid.TryParse(args[0], out var id))
if (!NetEntity.TryParse(args[0], out var idNet) ||
!_entManager.TryGetEntity(idNet, out var id))
{
shell.WriteLine($"{args[0]} is not a valid entity.");
return;
@@ -51,18 +55,16 @@ sealed class TileReplaceCommand : IConsoleCommand
return;
}
var tileDefinitionManager = IoCManager.Resolve<ITileDefinitionManager>();
var tileA = tileDefinitionManager[tileIdA];
var tileB = tileDefinitionManager[tileIdB];
var tileA = _tileDef[tileIdA];
var tileB = _tileDef[tileIdB];
var mapManager = IoCManager.Resolve<IMapManager>();
if (!mapManager.TryGetGrid(gridId, out var grid))
if (!_mapManager.TryGetGrid(gridId, out var grid))
{
shell.WriteLine($"No grid exists with id {gridId}");
return;
}
if (!entityManager.EntityExists(grid.Owner))
if (!_entManager.EntityExists(grid.Owner))
{
shell.WriteLine($"Grid {gridId} doesn't have an associated grid entity.");
return;

27
Content.Server/Construction/Commands/TileWallsCommand.cs
View File

@@ -11,6 +11,10 @@ namespace Content.Server.Construction.Commands
[AdminCommand(AdminFlags.Mapping)]
sealed class TileWallsCommand : IConsoleCommand
{
[Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly ITileDefinitionManager _tileDefManager = default!;
// ReSharper disable once StringLiteralTypo
public string Command => "tilewalls";
public string Description => "Puts an underplating tile below every wall on a grid.";
@@ -25,7 +29,6 @@ namespace Content.Server.Construction.Commands
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var player = shell.Player as IPlayerSession;
var entityManager = IoCManager.Resolve<IEntityManager>();
EntityUid? gridId;
switch (args.Length)
@@ -37,10 +40,10 @@ namespace Content.Server.Construction.Commands
return;
}
gridId = entityManager.GetComponent<TransformComponent>(playerEntity).GridUid;
gridId = _entManager.GetComponent<TransformComponent>(playerEntity).GridUid;
break;
case 1:
if (!EntityUid.TryParse(args[0], out var id))
if (!NetEntity.TryParse(args[0], out var idNet) || !_entManager.TryGetEntity(idNet, out var id))
{
shell.WriteLine($"{args[0]} is not a valid entity.");
return;
@@ -53,27 +56,25 @@ namespace Content.Server.Construction.Commands
return;
}
var mapManager = IoCManager.Resolve<IMapManager>();
if (!mapManager.TryGetGrid(gridId, out var grid))
if (!_mapManager.TryGetGrid(gridId, out var grid))
{
shell.WriteLine($"No grid exists with id {gridId}");
return;
}
if (!entityManager.EntityExists(grid.Owner))
if (!_entManager.EntityExists(grid.Owner))
{
shell.WriteLine($"Grid {gridId} doesn't have an associated grid entity.");
return;
}
var tileDefinitionManager = IoCManager.Resolve<ITileDefinitionManager>();
var tagSystem = entityManager.EntitySysManager.GetEntitySystem<TagSystem>();
var underplating = tileDefinitionManager[TilePrototypeId];
var tagSystem = _entManager.EntitySysManager.GetEntitySystem<TagSystem>();
var underplating = _tileDefManager[TilePrototypeId];
var underplatingTile = new Tile(underplating.TileId);
var changed = 0;
foreach (var child in entityManager.GetComponent<TransformComponent>(grid.Owner).ChildEntities)
foreach (var child in _entManager.GetComponent<TransformComponent>(grid.Owner).ChildEntities)
{
if (!entityManager.EntityExists(child))
if (!_entManager.EntityExists(child))
{
continue;
}
@@ -83,7 +84,7 @@ namespace Content.Server.Construction.Commands
continue;
}
var childTransform = entityManager.GetComponent<TransformComponent>(child);
var childTransform = _entManager.GetComponent<TransformComponent>(child);
if (!childTransform.Anchored)
{
@@ -91,7 +92,7 @@ namespace Content.Server.Construction.Commands
}
var tile = grid.GetTileRef(childTransform.Coordinates);
var tileDef = (ContentTileDefinition) tileDefinitionManager[tile.Tile.TypeId];
var tileDef = (ContentTileDefinition) _tileDefManager[tile.Tile.TypeId];
if (tileDef.ID == TilePrototypeId)
{

12
Content.Server/Construction/ConstructionSystem.Initial.cs
View File

@@ -247,7 +247,7 @@ namespace Content.Server.Construction
return null;
}
var doAfterArgs = new DoAfterArgs(user, doAfterTime, new AwaitedDoAfterEvent(), null)
var doAfterArgs = new DoAfterArgs(EntityManager, user, doAfterTime, new AwaitedDoAfterEvent(), null)
{
BreakOnDamage = true,
BreakOnTargetMove = false,
@@ -432,9 +432,11 @@ namespace Content.Server.Construction
_beingBuilt[args.SenderSession] = newSet;
}
var location = GetCoordinates(ev.Location);
foreach (var condition in constructionPrototype.Conditions)
{
if (!condition.Condition(user, ev.Location, ev.Angle.GetCardinalDir()))
if (!condition.Condition(user, location, ev.Angle.GetCardinalDir()))
{
Cleanup();
return;
@@ -453,7 +455,7 @@ namespace Content.Server.Construction
return;
}
var mapPos = ev.Location.ToMap(EntityManager);
var mapPos = location.ToMap(EntityManager);
var predicate = GetPredicate(constructionPrototype.CanBuildInImpassable, mapPos);
if (!_interactionSystem.InRangeUnobstructed(user, mapPos, predicate: predicate))
@@ -515,11 +517,11 @@ namespace Content.Server.Construction
var xform = Transform(structure);
var wasAnchored = xform.Anchored;
xform.Anchored = false;
xform.Coordinates = ev.Location;
xform.Coordinates = GetCoordinates(ev.Location);
xform.LocalRotation = constructionPrototype.CanRotate ? ev.Angle : Angle.Zero;
xform.Anchored = wasAnchored;
RaiseNetworkEvent(new AckStructureConstructionMessage(ev.Ack, structure));
RaiseNetworkEvent(new AckStructureConstructionMessage(ev.Ack, GetNetEntity(structure)));
_adminLogger.Add(LogType.Construction, LogImpact.Low, $"{ToPrettyString(user):player} has turned a {ev.PrototypeName} construction ghost into {ToPrettyString(structure)} at {Transform(structure).Coordinates}");
Cleanup();
}

8
Content.Server/Construction/ConstructionSystem.Interactions.cs
View File

@@ -240,7 +240,7 @@ namespace Content.Server.Construction
interactDoAfter.User,
interactDoAfter.Used!.Value,
uid,
interactDoAfter.ClickLocation);
GetCoordinates(interactDoAfter.ClickLocation));
doAfterState = DoAfterState.Completed;
}
@@ -281,9 +281,9 @@ namespace Content.Server.Construction
// If we still haven't completed this step's DoAfter...
if (doAfterState == DoAfterState.None && insertStep.DoAfter > 0)
{
var doAfterEv = new ConstructionInteractDoAfterEvent(interactUsing);
var doAfterEv = new ConstructionInteractDoAfterEvent(EntityManager, interactUsing);
var doAfterEventArgs = new DoAfterArgs(interactUsing.User, step.DoAfter, doAfterEv, uid, uid, interactUsing.Used)
var doAfterEventArgs = new DoAfterArgs(EntityManager, interactUsing.User, step.DoAfter, doAfterEv, uid, uid, interactUsing.Used)
{
BreakOnDamage = false,
BreakOnTargetMove = true,
@@ -367,7 +367,7 @@ namespace Content.Server.Construction
uid,
TimeSpan.FromSeconds(toolInsertStep.DoAfter),
new [] { toolInsertStep.Tool },
new ConstructionInteractDoAfterEvent(interactUsing),
new ConstructionInteractDoAfterEvent(EntityManager, interactUsing),
out var doAfter);
return result && doAfter != null ? HandleResult.DoAfter : HandleResult.False;

2
Content.Server/Construction/PartExchangerSystem.cs
View File

@@ -170,7 +170,7 @@ public sealed class PartExchangerSystem : EntitySystem
component.AudioStream = _audio.PlayPvs(component.ExchangeSound, uid);
_doAfter.TryStartDoAfter(new DoAfterArgs(args.User, component.ExchangeDuration, new ExchangerDoAfterEvent(), uid, target: args.Target, used: uid)
_doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, component.ExchangeDuration, new ExchangerDoAfterEvent(), uid, target: args.Target, used: uid)
{
BreakOnDamage = true,
BreakOnUserMove = true