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

Revert "Xui (#154)"

Browse Source 
This reverts commit 5d68bafd17.
This commit is contained in:
Jabak
2024-10-31 17:38:04 +03:00
parent 5d68bafd17
commit 48a7c8f1af
25 changed files with 117 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/_White/AutoRegenReagent/AutoRegenReagentComponent.cs
View File

@@ -1,7 +1,6 @@
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.Reagent;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
using Robust.Shared.Prototypes;
namespace Content.Server._White.AutoRegenReagent
{
@@ -12,10 +11,10 @@ namespace Content.Server._White.AutoRegenReagent
public string? SolutionName = null; // we'll fail during tests otherwise
[DataField("reagents", required: true)]
public List<ProtoId<ReagentPrototype>> Reagents = default!;
public List<string> Reagents = default!;
[DataField]
public ProtoId<ReagentPrototype> CurrentReagent = default!;
public string CurrentReagent = "";
[DataField]
public int CurrentIndex = 0;

23
Content.Server/_White/AutoRegenReagent/AutoRegenReagentSystem.cs
View File

@@ -1,11 +1,10 @@
using Content.Shared.Chemistry.EntitySystems;
using Content.Server.Chemistry.Containers.EntitySystems;
using Content.Server.Chemistry.EntitySystems;
using Content.Server.Popups;
using Content.Shared.Examine;
using Content.Shared.Interaction.Events;
using Content.Shared.Verbs;
using Robust.Shared.Timing;
using Robust.Shared.Prototypes;
namespace Content.Server._White.AutoRegenReagent
{
@@ -14,10 +13,9 @@ namespace Content.Server._White.AutoRegenReagent
/// </summary>
public sealed class AutoRegenReagentSystem : EntitySystem
{
[Dependency] private readonly SharedSolutionContainerSystem _solutionSystem = default!;
[Dependency] private readonly SolutionContainerSystem _solutionSystem = default!;
[Dependency] private readonly PopupSystem _popups = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
public override void Initialize()
{
@@ -47,7 +45,7 @@ namespace Content.Server._White.AutoRegenReagent
if (autoComp.Solution == null)
return;
_solutionSystem.TryAddReagent(autoComp.Solution.Value, autoComp.CurrentReagent, autoComp.UnitsPerInterval, out _);
_solutionSystem.TryAddReagent(autoComp.Solution.Value, autoComp.CurrentReagent, autoComp.UnitsPerInterval);
}
}
@@ -71,8 +69,7 @@ namespace Content.Server._White.AutoRegenReagent
private void OnExamined(EntityUid uid, AutoRegenReagentComponent component, ExaminedEvent args)
{
if (_prototypeManager.TryIndex(component.CurrentReagent, out var reagentProto))
args.PushMarkup(Loc.GetString("reagent-name", ("reagent", reagentProto.LocalizedName)));
args.PushMarkup(Loc.GetString("reagent-name", ("reagent", component.CurrentReagent)));
}
private void AddSwitchVerb(EntityUid uid, AutoRegenReagentComponent component,
@@ -109,7 +106,7 @@ namespace Content.Server._White.AutoRegenReagent
component.CurrentReagent = component.Reagents[component.CurrentIndex];
}
private void SwitchReagent(AutoRegenReagentComponent component, EntityUid? user = null)
private string SwitchReagent(AutoRegenReagentComponent component, EntityUid? user = null)
{
if (component.CurrentIndex + 1 == component.Reagents.Count)
component.CurrentIndex = 0;
@@ -121,14 +118,10 @@ namespace Content.Server._White.AutoRegenReagent
component.CurrentReagent = component.Reagents[component.CurrentIndex];
if (user == null)
return;
if (!_prototypeManager.TryIndex(component.CurrentReagent, out var reagentProto))
return;
_popups.PopupEntity(Loc.GetString("autoregen-switched", ("reagent", reagentProto.LocalizedName)), user.Value, user.Value);
if (user != null)
_popups.PopupEntity(Loc.GetString("autoregen-switched", ("reagent", component.CurrentReagent)), user.Value, user.Value);
return component.CurrentReagent;
}
}
}