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

Fix 3000 errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 18:09:01 +01:00
parent 2bfec7ec62
commit 2a3b7d809d
569 changed files with 2979 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
Content.Client/Viewport/GameScreenBase.cs
View File

@@ -6,7 +6,6 @@ using Content.Client.ContextMenu.UI;
using Content.Client.Interactable;
using Content.Client.Interactable.Components;
using Content.Client.State;
using Content.Shared;
using Content.Shared.CCVar;
using Robust.Client.GameObjects;
using Robust.Client.Graphics;
@@ -44,7 +43,7 @@ namespace Content.Client.Viewport
private IEventBus _eventBus => _entityManager.EventBus;
private IEntity? _lastHoveredEntity;
private EntityUid _lastHoveredEntity;
private bool _outlineEnabled = true;
@@ -84,7 +83,7 @@ namespace Content.Client.Viewport
// lead to extremely thick outlines in the other viewports. Fixing this probably requires changing how the
// hover outline works, so that it only highlights the entity in a single viewport.
IEntity? entityToClick = null;
EntityUid entityToClick = default;
var renderScale = 1;
if (UserInterfaceManager.CurrentlyHovered is IViewportControl vp)
{
@@ -107,7 +106,7 @@ namespace Content.Client.Viewport
}
var inRange = false;
if (localPlayer.ControlledEntity != null && entityToClick != null)
if (localPlayer.ControlledEntity != default && entityToClick != default)
{
inRange = localPlayer.InRangeUnobstructed(entityToClick, ignoreInsideBlocker: true);
}
@@ -115,7 +114,7 @@ namespace Content.Client.Viewport
InteractionOutlineComponent? outline;
if(!_outlineEnabled || !ConfigurationManager.GetCVar(CCVars.OutlineEnabled))
{
if(entityToClick != null && IoCManager.Resolve<IEntityManager>().TryGetComponent(entityToClick, out outline))
if(entityToClick != default && _entityManager.TryGetComponent(entityToClick, out outline))
{
outline.OnMouseLeave(); //Prevent outline remains from persisting post command.
}
@@ -124,7 +123,7 @@ namespace Content.Client.Viewport
if (entityToClick == _lastHoveredEntity)
{
if (entityToClick != null && IoCManager.Resolve<IEntityManager>().TryGetComponent(entityToClick, out outline))
if (entityToClick != default && _entityManager.TryGetComponent(entityToClick, out outline))
{
outline.UpdateInRange(inRange, renderScale);
}
@@ -132,42 +131,42 @@ namespace Content.Client.Viewport
return;
}
if (_lastHoveredEntity != null && !((!IoCManager.Resolve<IEntityManager>().EntityExists(_lastHoveredEntity) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(_lastHoveredEntity).EntityLifeStage) >= EntityLifeStage.Deleted) &&
IoCManager.Resolve<IEntityManager>().TryGetComponent(_lastHoveredEntity, out outline))
if (_lastHoveredEntity != default && !((!_entityManager.EntityExists(_lastHoveredEntity) ? EntityLifeStage.Deleted : _entityManager.GetComponent<MetaDataComponent>(_lastHoveredEntity).EntityLifeStage) >= EntityLifeStage.Deleted) &&
_entityManager.TryGetComponent(_lastHoveredEntity, out outline))
{
outline.OnMouseLeave();
}
_lastHoveredEntity = entityToClick;
if (_lastHoveredEntity != null && IoCManager.Resolve<IEntityManager>().TryGetComponent(_lastHoveredEntity, out outline))
if (_lastHoveredEntity != default && _entityManager.TryGetComponent(_lastHoveredEntity, out outline))
{
outline.OnMouseEnter(inRange, renderScale);
}
}
public IEntity? GetEntityUnderPosition(MapCoordinates coordinates)
public EntityUid GetEntityUnderPosition(MapCoordinates coordinates)
{
var entitiesUnderPosition = GetEntitiesUnderPosition(coordinates);
return entitiesUnderPosition.Count > 0 ? entitiesUnderPosition[0] : null;
return entitiesUnderPosition.Count > 0 ? entitiesUnderPosition[0] : default;
}
public IList<IEntity> GetEntitiesUnderPosition(EntityCoordinates coordinates)
public IList<EntityUid> GetEntitiesUnderPosition(EntityCoordinates coordinates)
{
return GetEntitiesUnderPosition(coordinates.ToMap(EntityManager));
}
public IList<IEntity> GetEntitiesUnderPosition(MapCoordinates coordinates)
public IList<EntityUid> GetEntitiesUnderPosition(MapCoordinates coordinates)
{
// Find all the entities intersecting our click
var entities = IoCManager.Resolve<IEntityLookup>().GetEntitiesIntersecting(coordinates.MapId,
Box2.CenteredAround(coordinates.Position, (1, 1)));
// Check the entities against whether or not we can click them
var foundEntities = new List<(IEntity clicked, int drawDepth, uint renderOrder)>();
var foundEntities = new List<(EntityUid clicked, int drawDepth, uint renderOrder)>();
foreach (var entity in entities)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<ClickableComponent?>(entity, out var component)
if (_entityManager.TryGetComponent<ClickableComponent?>(entity, out var component)
&& !entity.IsInContainer()
&& component.CheckClick(coordinates.Position, out var drawDepthClicked, out var renderOrder))
{
@@ -176,9 +175,9 @@ namespace Content.Client.Viewport
}
if (foundEntities.Count == 0)
return new List<IEntity>();
return new List<EntityUid>();
foundEntities.Sort(new ClickableEntityComparer());
foundEntities.Sort(new ClickableEntityComparer(_entityManager));
// 0 is the top element.
foundEntities.Reverse();
return foundEntities.Select(a => a.clicked).ToList();
@@ -193,20 +192,27 @@ namespace Content.Client.Viewport
/// <param name="stateManager">state manager to use to get the current game screen</param>
/// <param name="coordinates">coordinates to check</param>
/// <returns>the entities under the position, empty list if none found</returns>
public static IList<IEntity> GetEntitiesUnderPosition(IStateManager stateManager, EntityCoordinates coordinates)
public static IList<EntityUid> GetEntitiesUnderPosition(IStateManager stateManager, EntityCoordinates coordinates)
{
if (stateManager.CurrentState is GameScreenBase gameScreenBase)
{
return gameScreenBase.GetEntitiesUnderPosition(coordinates);
}
return ImmutableList<IEntity>.Empty;
return ImmutableList<EntityUid>.Empty;
}
internal class ClickableEntityComparer : IComparer<(IEntity clicked, int depth, uint renderOrder)>
internal class ClickableEntityComparer : IComparer<(EntityUid clicked, int depth, uint renderOrder)>
{
public int Compare((IEntity clicked, int depth, uint renderOrder) x,
(IEntity clicked, int depth, uint renderOrder) y)
private readonly IEntityManager _entities;
public ClickableEntityComparer(IEntityManager entities)
{
_entities = entities;
}
public int Compare((EntityUid clicked, int depth, uint renderOrder) x,
(EntityUid clicked, int depth, uint renderOrder) y)
{
var val = x.depth.CompareTo(y.depth);
if (val != 0)
@@ -223,8 +229,8 @@ namespace Content.Client.Viewport
}
*/
var transX = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(x.clicked);
var transY = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(y.clicked);
var transX = _entities.GetComponent<TransformComponent>(x.clicked);
var transY = _entities.GetComponent<TransformComponent>(y.clicked);
val = transX.Coordinates.Y.CompareTo(transY.Coordinates.Y);
if (val != 0)
{
@@ -254,7 +260,7 @@ namespace Content.Client.Viewport
if (args.Viewport is IViewportControl vp)
{
var mousePosWorld = vp.ScreenToMap(kArgs.PointerLocation.Position);
entityToClick = GetEntityUnderPosition(mousePosWorld) ?? EntityUid.Invalid;
entityToClick = GetEntityUnderPosition(mousePosWorld);
coordinates = MapManager.TryFindGridAt(mousePosWorld, out var grid) ? grid.MapToGrid(mousePosWorld) :
EntityCoordinates.FromMap(MapManager, mousePosWorld);