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

Replace GridEntityId with Owner (#12743)

Browse Source
This commit is contained in:
metalgearsloth
2022-12-12 14:59:02 +11:00
committed by GitHub
parent 4cbf78646a
commit 3b3963083b
75 changed files with 190 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.IntegrationTests/Tests/CargoTest.cs
View File

@@ -58,7 +58,7 @@ public sealed class CargoTest
{
var mapId = mapManager.CreateMap();
var grid = mapManager.CreateGrid(mapId);
var coord = new EntityCoordinates(grid.GridEntityId, 0, 0);
var coord = new EntityCoordinates(grid.Owner, 0, 0);
var protoIds = protoManager.EnumeratePrototypes<EntityPrototype>()
.Where(p=>!p.Abstract)

4
Content.IntegrationTests/Tests/EntityTest.cs
View File

@@ -41,7 +41,7 @@ namespace Content.IntegrationTests.Tests
{
var mapId = mapManager.CreateMap();
var grid = mapManager.CreateGrid(mapId);
var coord = new EntityCoordinates(grid.GridEntityId, 0, 0);
var coord = new EntityCoordinates(grid.Owner, 0, 0);
entityMan.SpawnEntity(protoId, coord);
}
});
@@ -83,7 +83,7 @@ namespace Content.IntegrationTests.Tests
.ToList();
var mapId = mapManager.CreateMap();
var grid = mapManager.CreateGrid(mapId);
var coord = new EntityCoordinates(grid.GridEntityId, 0, 0);
var coord = new EntityCoordinates(grid.Owner, 0, 0);
foreach (var protoId in protoIds)
{
entityMan.SpawnEntity(protoId, coord);

4
Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs
View File

@@ -58,7 +58,7 @@ public sealed class FluidSpill
{
mapId = mapManager.CreateMap();
var grid = mapManager.CreateGrid(mapId);
gridId = grid.GridEntityId;
gridId = grid.Owner;
for (var x = 0; x < 3; x++)
{
@@ -125,7 +125,7 @@ public sealed class FluidSpill
{
mapId = mapManager.CreateMap();
var grid = mapManager.CreateGrid(mapId);
gridId = grid.GridEntityId;
gridId = grid.Owner;
for (var x = 0; x < 3; x++)
{

2
Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
View File

@@ -104,7 +104,7 @@ namespace Content.IntegrationTests.Tests.Fluids
sMapId = sMapManager.CreateMap();
sMapManager.SetMapPaused(sMapId, true);
sGrid = sMapManager.CreateGrid(sMapId);
sGridId = sGrid.GridEntityId;
sGridId = sGrid.Owner;
metaSystem.SetEntityPaused(sGridId, true); // See https://github.com/space-wizards/RobustToolbox/issues/1444
var tileDefinition = sTileDefinitionManager["UnderPlating"];

6
Content.IntegrationTests/Tests/GravityGridTest.cs
View File

@@ -68,8 +68,8 @@ namespace Content.IntegrationTests.Tests
Assert.That(generatorComponent.GravityActive, Is.True);
var grid1Entity = grid1.GridEntityId;
var grid2Entity = grid2.GridEntityId;
var grid1Entity = grid1.Owner;
var grid2Entity = grid2.Owner;
Assert.That(!entityMan.GetComponent<GravityComponent>(grid1Entity).EnabledVV);
Assert.That(entityMan.GetComponent<GravityComponent>(grid2Entity).EnabledVV);
@@ -87,7 +87,7 @@ namespace Content.IntegrationTests.Tests
Assert.That(generatorComponent.GravityActive, Is.False);
var grid2Entity = grid2.GridEntityId;
var grid2Entity = grid2.Owner;
Assert.That(entityMan.GetComponent<GravityComponent>(grid2Entity).EnabledVV, Is.False);
});

6
Content.IntegrationTests/Tests/PostMapInitTest.cs
View File

@@ -202,11 +202,11 @@ namespace Content.IntegrationTests.Tests
var memberQuery = entManager.GetEntityQuery<StationMemberComponent>();
var grids = mapManager.GetAllMapGrids(mapId).ToList();
var gridUids = grids.Select(o => o.GridEntityId).ToList();
var gridUids = grids.Select(o => o.Owner).ToList();
foreach (var grid in grids)
{
if (!memberQuery.HasComponent(grid.GridEntityId))
if (!memberQuery.HasComponent(grid.Owner))
continue;
var area = grid.LocalAABB.Width * grid.LocalAABB.Height;
@@ -214,7 +214,7 @@ namespace Content.IntegrationTests.Tests
if (area > largest)
{
largest = area;
targetGrid = grid.GridEntityId;
targetGrid = grid.Owner;
}
}

8
Content.IntegrationTests/Tests/SaveLoadMapTest.cs
View File

@@ -35,13 +35,13 @@ namespace Content.IntegrationTests.Tests
{
var mapGrid = mapManager.CreateGrid(mapId);
var mapGridEnt = mapGrid.GridEntityId;
var mapGridEnt = mapGrid.Owner;
sEntities.GetComponent<TransformComponent>(mapGridEnt).WorldPosition = new Vector2(10, 10);
mapGrid.SetTile(new Vector2i(0,0), new Tile(1, (TileRenderFlag)1, 255));
}
{
var mapGrid = mapManager.CreateGrid(mapId);
var mapGridEnt = mapGrid.GridEntityId;
var mapGridEnt = mapGrid.Owner;
sEntities.GetComponent<TransformComponent>(mapGridEnt).WorldPosition = new Vector2(-8, -8);
mapGrid.SetTile(new Vector2i(0, 0), new Tile(2, (TileRenderFlag)1, 254));
}
@@ -61,7 +61,7 @@ namespace Content.IntegrationTests.Tests
{
{
if (!mapManager.TryFindGridAt(new MapId(10), new Vector2(10, 10), out var mapGrid) ||
!sEntities.TryGetComponent<TransformComponent>(mapGrid.GridEntityId, out var gridXform))
!sEntities.TryGetComponent<TransformComponent>(mapGrid.Owner, out var gridXform))
{
Assert.Fail();
return;
@@ -73,7 +73,7 @@ namespace Content.IntegrationTests.Tests
}
{
if (!mapManager.TryFindGridAt(new MapId(10), new Vector2(-8, -8), out var mapGrid) ||
!sEntities.TryGetComponent<TransformComponent>(mapGrid.GridEntityId, out var gridXform))
!sEntities.TryGetComponent<TransformComponent>(mapGrid.Owner, out var gridXform))
{
Assert.Fail();
return;

2
Content.IntegrationTests/Tests/SaveLoadSaveTest.cs
View File

@@ -31,7 +31,7 @@ namespace Content.IntegrationTests.Tests
var mapId0 = mapManager.CreateMap();
// TODO: Properly find the "main" station grid.
var grid0 = mapManager.CreateGrid(mapId0);
mapLoader.Save(grid0.GridEntityId, "save load save 1.yml");
mapLoader.Save(grid0.Owner, "save load save 1.yml");
var mapId1 = mapManager.CreateMap();
var grid1 = mapLoader.LoadGrid(mapId1, "save load save 1.yml", new MapLoadOptions() {LoadMap = false});
mapLoader.Save(grid1!.Value, "save load save 2.yml");

2
Content.IntegrationTests/Tests/ShuttleTest.cs
View File

@@ -28,7 +28,7 @@ namespace Content.IntegrationTests.Tests
{
var mapId = mapMan.CreateMap();
var grid = mapMan.CreateGrid(mapId);
gridEnt = grid.GridEntityId;
gridEnt = grid.Owner;
Assert.That(sEntities.HasComponent<ShuttleComponent>(gridEnt));
Assert.That(sEntities.TryGetComponent<PhysicsComponent>(gridEnt, out var physicsComponent));