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

Gets rid of all ComponentManager usages. (#4707)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-09-28 13:35:29 +02:00
committed by GitHub
parent 7953e5b962
commit 0be5ff829b
158 changed files with 321 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Administration/Commands/DeleteComponent.cs
View File

@@ -31,14 +31,14 @@ namespace Content.Server.Administration.Commands
}
var componentType = registration.Type;
var components = entityManager.ComponentManager.GetAllComponents(componentType, true);
var components = entityManager.GetAllComponents(componentType, true);
var i = 0;
foreach (var component in components)
{
var uid = component.Owner.Uid;
entityManager.ComponentManager.RemoveComponent(uid, component);
entityManager.RemoveComponent(uid, component);
i++;
}

2
Content.Server/Administration/Commands/DeleteEntitiesWithComponent.cs
View File

@@ -36,7 +36,7 @@ namespace Content.Server.Administration.Commands
var entityManager = IoCManager.Resolve<IEntityManager>();
var entitiesWithComponents = components.Select(c => entityManager.ComponentManager.GetAllComponents(c).Select(x => x.Owner));
var entitiesWithComponents = components.Select(c => entityManager.GetAllComponents(c).Select(x => x.Owner));
var entitiesWithAllComponents = entitiesWithComponents.Skip(1).Aggregate(new HashSet<IEntity>(entitiesWithComponents.First()), (h, e) => { h.IntersectWith(e); return h; });
var count = 0;

2
Content.Server/Administration/Commands/FindEntitiesWithComponents.cs
View File

@@ -47,7 +47,7 @@ namespace Content.Server.Administration.Commands
var entityManager = IoCManager.Resolve<IEntityManager>();
var entityIds = new HashSet<string>();
var entitiesWithComponents = components.Select(c => entityManager.ComponentManager.GetAllComponents(c).Select(x => x.Owner));
var entitiesWithComponents = components.Select(c => entityManager.GetAllComponents(c).Select(x => x.Owner));
var entitiesWithAllComponents = entitiesWithComponents.Skip(1).Aggregate(new HashSet<IEntity>(entitiesWithComponents.First()), (h, e) => { h.IntersectWith(e); return h; });
foreach (var entity in entitiesWithAllComponents)

2
Content.Server/Administration/Commands/RemoveExtraComponents.cs
View File

@@ -44,7 +44,7 @@ namespace Content.Server.Administration.Commands
if (entity.Prototype.Components.ContainsKey(component.Name))
continue;
entityManager.ComponentManager.RemoveComponent(entity.Uid, component);
entityManager.RemoveComponent(entity.Uid, component);
components++;
modified = true;

13
Content.Server/Administration/Commands/WarpCommand.cs
View File

@@ -38,12 +38,12 @@ namespace Content.Server.Administration.Commands
return;
}
var comp = IoCManager.Resolve<IComponentManager>();
var entMan = IoCManager.Resolve<IEntityManager>();
var location = args[0];
if (location == "?")
{
var locations = string.Join(", ",
comp.EntityQuery<WarpPointComponent>(true)
entMan.EntityQuery<WarpPointComponent>(true)
.Select(p => p.Location)
.Where(p => p != null)
.OrderBy(p => p)
@@ -62,9 +62,8 @@ namespace Content.Server.Administration.Commands
var mapManager = IoCManager.Resolve<IMapManager>();
var currentMap = player.AttachedEntity.Transform.MapID;
var currentGrid = player.AttachedEntity.Transform.GridID;
var entityManager = IoCManager.Resolve<IEntityManager>();
var found = comp.EntityQuery<WarpPointComponent>(true)
var found = entMan.EntityQuery<WarpPointComponent>(true)
.Where(p => p.Location == location)
.Select(p => p.Owner.Transform.Coordinates)
.OrderBy(p => p, Comparer<EntityCoordinates>.Create((a, b) =>
@@ -72,8 +71,8 @@ namespace Content.Server.Administration.Commands
// Sort so that warp points on the same grid/map are first.
// So if you have two maps loaded with the same warp points,
// it will prefer the warp points on the map you're currently on.
var aGrid = a.GetGridId(entityManager);
var bGrid = b.GetGridId(entityManager);
var aGrid = a.GetGridId(entMan);
var bGrid = b.GetGridId(entMan);
if (aGrid == bGrid)
{
@@ -112,7 +111,7 @@ namespace Content.Server.Administration.Commands
}))
.FirstOrDefault();
if (found.GetGridId(entityManager) != GridId.Invalid)
if (found.GetGridId(entMan) != GridId.Invalid)
{
player.AttachedEntity.Transform.Coordinates = found;
if (player.AttachedEntity.TryGetComponent(out IPhysBody? physics))