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

Dewarns access (#16666)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
TemporalOroboros
2023-07-22 21:19:51 -07:00
committed by GitHub
parent 415701fd74
commit df1dcb74ac
27 changed files with 438 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/Access/AccessOverlay.cs
View File

@@ -11,14 +11,16 @@ public sealed class AccessOverlay : Overlay
{
private readonly IEntityManager _entityManager;
private readonly EntityLookupSystem _lookup;
private readonly SharedTransformSystem _xform;
private readonly Font _font;
public override OverlaySpace Space => OverlaySpace.ScreenSpace;
public AccessOverlay(IEntityManager entManager, IResourceCache cache, EntityLookupSystem lookup)
public AccessOverlay(IEntityManager entManager, IResourceCache cache, EntityLookupSystem lookup, SharedTransformSystem xform)
{
_entityManager = entManager;
_lookup = lookup;
_xform = xform;
_font = cache.GetFont("/Fonts/NotoSans/NotoSans-Regular.ttf", 12);
}
@@ -71,7 +73,7 @@ public sealed class AccessOverlay : Overlay
textStr = "";
}
var screenPos = args.ViewportControl.WorldToScreen(xform.WorldPosition);
var screenPos = args.ViewportControl.WorldToScreen(_xform.GetWorldPosition(xform));
args.ScreenHandle.DrawString(_font, screenPos, textStr, Color.Gold);
}

4
Content.Client/Access/AccessSystem.cs
View File

@@ -2,4 +2,6 @@ using Content.Shared.Access.Systems;
namespace Content.Client.Access;
public sealed class AccessSystem : SharedAccessSystem {}
public sealed class AccessSystem : SharedAccessSystem
{
}

8
Content.Client/Access/Commands/ShowAccessReadersCommand.cs
View File

@@ -13,7 +13,8 @@ public sealed class ShowAccessReadersCommand : IConsoleCommand
{
var collection = IoCManager.Instance;
if (collection == null) return;
if (collection == null)
return;
var overlay = collection.Resolve<IOverlayManager>();
@@ -25,9 +26,10 @@ public sealed class ShowAccessReadersCommand : IConsoleCommand
var entManager = collection.Resolve<IEntityManager>();
var cache = collection.Resolve<IResourceCache>();
var system = entManager.EntitySysManager.GetEntitySystem<EntityLookupSystem>();
var lookup = entManager.System<EntityLookupSystem>();
var xform = entManager.System<SharedTransformSystem>();
overlay.AddOverlay(new AccessOverlay(entManager, cache, system));
overlay.AddOverlay(new AccessOverlay(entManager, cache, lookup, xform));
shell.WriteLine($"Set access reader debug overlay to true");
}
}

5
Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
View File

@@ -56,9 +56,10 @@ namespace Content.Client.Access.UI
protected override void Dispose(bool disposing)
{
base.Dispose(disposing);
if (!disposing) return;
if (!disposing)
return;
_window?.Dispose();
}
}
}

4
Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs
View File

@@ -51,7 +51,9 @@ namespace Content.Client.Access.UI
protected override void Dispose(bool disposing)
{
base.Dispose(disposing);
if (!disposing) return;
if (!disposing)
return;
_window?.Dispose();
}

5
Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
View File

@@ -15,6 +15,8 @@ namespace Content.Client.Access.UI
public sealed partial class IdCardConsoleWindow : DefaultWindow
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly ILogManager _logManager = default!;
private readonly ISawmill _logMill = default!;
private readonly IdCardConsoleBoundUserInterface _owner;
@@ -30,6 +32,7 @@ namespace Content.Client.Access.UI
{
RobustXamlLoader.Load(this);
IoCManager.InjectDependencies(this);
_logMill = _logManager.GetSawmill(SharedIdCardConsoleSystem.Sawmill);
_owner = owner;
@@ -67,7 +70,7 @@ namespace Content.Client.Access.UI
{
if (!prototypeManager.TryIndex<AccessLevelPrototype>(access, out var accessLevel))
{
Logger.ErrorS(SharedIdCardConsoleSystem.Sawmill, $"Unable to find accesslevel for {access}");
_logMill.Error($"Unable to find accesslevel for {access}");
continue;
}