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

Inline Transform

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 14:20:34 +01:00
parent 69b270017b
commit a5b57c8e10
283 changed files with 742 additions and 709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Storage/Components/EntityStorageComponent.cs
View File

@@ -325,7 +325,7 @@ namespace Content.Server.Storage.Components
public virtual Vector2 ContentsDumpPosition()
{
return Owner.Transform.WorldPosition;
return IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).WorldPosition;
}
private void EmptyContents()
@@ -334,7 +334,7 @@ namespace Content.Server.Storage.Components
{
if (Contents.Remove(contained))
{
contained.Transform.WorldPosition = ContentsDumpPosition();
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(contained.Uid).WorldPosition = ContentsDumpPosition();
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<IPhysBody?>(contained.Uid, out var physics))
{
physics.CanCollide = true;
@@ -369,13 +369,13 @@ namespace Content.Server.Storage.Components
// Trying to add while open just dumps it on the ground below us.
if (Open)
{
entity.Transform.WorldPosition = Owner.Transform.WorldPosition;
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity.Uid).WorldPosition = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).WorldPosition;
return true;
}
if (!Contents.Insert(entity)) return false;
entity.Transform.LocalPosition = Vector2.Zero;
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity.Uid).LocalPosition = Vector2.Zero;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out IPhysBody? body))
{
body.CanCollide = false;

4
Content.Server/Storage/Components/SecretStashComponent.cs
View File

@@ -91,7 +91,7 @@ namespace Content.Server.Storage.Components
}
else if (_itemContainer.Remove(_itemContainer.ContainedEntity))
{
_itemContainer.ContainedEntity.Transform.Coordinates = Owner.Transform.Coordinates;
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(_itemContainer.ContainedEntity.Uid).Coordinates = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).Coordinates;
}
return true;
@@ -111,7 +111,7 @@ namespace Content.Server.Storage.Components
// drop item inside
if (_itemContainer.ContainedEntity != null)
{
_itemContainer.ContainedEntity.Transform.Coordinates = Owner.Transform.Coordinates;
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(_itemContainer.ContainedEntity.Uid).Coordinates = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).Coordinates;
}
}
}

12
Content.Server/Storage/Components/ServerStorageComponent.cs
View File

@@ -160,7 +160,7 @@ namespace Content.Server.Storage.Components
return false;
}
if (entity.Transform.Anchored)
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity.Uid).Anchored)
{
return false;
}
@@ -219,7 +219,7 @@ namespace Content.Server.Storage.Components
if (!_sizeCache.TryGetValue(message.Entity, out var size))
{
Logger.WarningS(LoggerName, $"Removed entity {message.Entity} without a cached size from storage {Owner} at {Owner.Transform.MapPosition}");
Logger.WarningS(LoggerName, $"Removed entity {message.Entity} without a cached size from storage {Owner} at {IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).MapPosition}");
RecalculateStorageUsed();
return;
@@ -459,8 +459,8 @@ namespace Content.Server.Storage.Components
break;
}
var ownerTransform = Owner.Transform;
var playerTransform = player.Transform;
var ownerTransform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid);
var playerTransform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player.Uid);
if (!playerTransform.Coordinates.InRange(IoCManager.Resolve<IEntityManager>(), ownerTransform.Coordinates, 2) ||
Owner.IsInContainer() && !playerTransform.ContainsEntity(ownerTransform))
@@ -607,7 +607,7 @@ namespace Content.Server.Storage.Components
|| entity == eventArgs.User
|| !IoCManager.Resolve<IEntityManager>().HasComponent<SharedItemComponent>(entity.Uid))
continue;
var position = EntityCoordinates.FromMap(Owner.Transform.Parent?.Owner ?? Owner, entity.Transform.MapPosition);
var position = EntityCoordinates.FromMap(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).Parent?.Owner ?? Owner, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity.Uid).MapPosition);
if (PlayerInsertEntityInWorld(eventArgs.User, entity))
{
successfullyInserted.Add(entity.Uid);
@@ -638,7 +638,7 @@ namespace Content.Server.Storage.Components
|| eventArgs.Target == eventArgs.User
|| !IoCManager.Resolve<IEntityManager>().HasComponent<SharedItemComponent>(eventArgs.Target.Uid))
return false;
var position = EntityCoordinates.FromMap(Owner.Transform.Parent?.Owner ?? Owner, eventArgs.Target.Transform.MapPosition);
var position = EntityCoordinates.FromMap(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).Parent?.Owner ?? Owner, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(eventArgs.Target.Uid).MapPosition);
if (PlayerInsertEntityInWorld(eventArgs.User, eventArgs.Target))
{
#pragma warning disable 618

2
Content.Server/Storage/Components/StorageFillComponent.cs
View File

@@ -51,7 +51,7 @@ namespace Content.Server.Storage.Components
for (var i = 0; i < storageItem.Amount; i++)
{
storage.Insert(
IoCManager.Resolve<IEntityManager>().SpawnEntity(storageItem.PrototypeId, Owner.Transform.Coordinates));
IoCManager.Resolve<IEntityManager>().SpawnEntity(storageItem.PrototypeId, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).Coordinates));
}
if (!string.IsNullOrEmpty(storageItem.GroupId)) alreadySpawnedGroups.Add(storageItem.GroupId);