cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tippy fixes (#27475) 

How does that UISystemDependency not crash.
This commit is contained in:
metalgearsloth 2024-04-29 18:41:58 +10:00 committed by null
parent e680e1bfe4
commit 27a46814bc
No known key found for this signature in database
GPG Key ID: 212F05528FD678BE
3 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Client/Tips/TippyUIController.cs
View File

@ -23,13 +23,9 @@ namespace Content.Client.Tips;
public sealed class TippyUIController : UIController
{
[Dependency] private readonly IStateManager _state = default!;
[Dependency] private readonly IConsoleHost _conHost = default!;
[Dependency] private readonly IPrototypeManager _protoMan = default!;
[Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly IResourceCache _resCache = default!;
[UISystemDependency] private readonly AudioSystem _audio = default!;
[UISystemDependency] private readonly EntityManager _entSys = default!;
public const float Padding = 50;
public static Angle WaddleRotation = Angle.FromDegrees(10);
@ -44,11 +40,12 @@ public sealed class TippyUIController : UIController
{
base.Initialize();
UIManager.OnScreenChanged += OnScreenChanged;
SubscribeNetworkEvent<TippyEvent>(OnTippyEvent);
}
public void AddMessage(TippyEvent ev)
private void OnTippyEvent(TippyEvent msg, EntitySessionEventArgs args)
{
_queuedMessages.Enqueue(ev);
_queuedMessages.Enqueue(msg);
}
public override void FrameUpdate(FrameEventArgs args)
@ -146,7 +143,7 @@ public sealed class TippyUIController : UIController
return;
if (!EntityManager.HasComponent<PaperVisualsComponent>(_entity))
{
var paper = EntityManager.AddComponent<PaperVisualsComponent>(_entity);
var paper = EntityManager.AddComponent<PaperVisualsComponent>(_entity);
paper.BackgroundImagePath = "/Textures/Interface/Paper/paper_background_default.svg.96dpi.png";
paper.BackgroundPatchMargin = new(16f, 16f, 16f, 16f);
paper.BackgroundModulate = new(255, 255, 204);

20
Content.Client/Tips/TipsSystem.cs
View File

@ -1,20 +0,0 @@
using Content.Shared.Tips;
using Robust.Client.UserInterface;
namespace Content.Client.Tips;
public sealed class TipsSystem : EntitySystem
{
[Dependency] private readonly IUserInterfaceManager _uiMan = default!;
public override void Initialize()
{
base.Initialize();
SubscribeNetworkEvent<TippyEvent>(OnClippyEv);
}
private void OnClippyEv(TippyEvent ev)
{
_uiMan.GetUIController<TippyUIController>().AddMessage(ev);
}
}

1
Content.Server/Tips/TipsSystem.cs
View File

@ -115,7 +115,6 @@ public sealed class TipsSystem : EntitySystem
var ev = new TippyEvent(args[1]);
string proto;
if (args.Length > 2)
{
ev.Proto = args[2];